# HG changeset patch
# User Chris Cannam
# Date 1464339356 -3600
# Node ID 98a7fbbe9d88a6be7ed261c931a2548f367103ce
# Parent  f9b805d8cab4d19185f956214be920abeaaeb263# Parent  88061103b878d5f2a9b7bb57a5029087c812e2ce
Merge from default branch, and build fixes

diff -r f9b805d8cab4 -r 98a7fbbe9d88 src/hgrunner.cpp
--- a/src/hgrunner.cpp	Thu Mar 14 16:43:30 2013 +0000
+++ b/src/hgrunner.cpp	Fri May 27 09:55:56 2016 +0100
@@ -411,7 +411,7 @@
             emit commandCompleted(completedAction, m_stdout);
         } else {
             DEBUG << "HgRunner::finished: Command failed, exit code "
-                  << procExitCode << ", exit status " << procExitStatus
+                  << procExitCode << ", exit status " << int(procExitStatus)
                   << ", stderr follows" << endl;
             DEBUG << m_stderr << endl;
             emit commandFailed(completedAction, m_stderr, m_stdout);
diff -r f9b805d8cab4 -r 98a7fbbe9d88 src/mainwindow.cpp
--- a/src/mainwindow.cpp	Thu Mar 14 16:43:30 2013 +0000
+++ b/src/mainwindow.cpp	Fri May 27 09:55:56 2016 +0100
@@ -3048,6 +3048,16 @@
 
 void MainWindow::createMenus()
 {
+#ifdef Q_OS_LINUX
+    // In Ubuntu 14.04 the window's menu bar goes missing entirely if
+    // the user is running any desktop environment other than Unity
+    // (in which the faux single-menubar appears). The user has a
+    // workaround, to remove the appmenu-qt5 package, but that is
+    // awkward and the problem is so severe that it merits disabling
+    // the system menubar integration altogether. Like this:
+    menuBar()->setNativeMenuBar(false);
+#endif
+
     m_fileMenu = menuBar()->addMenu(tr("&File"));
 
     m_fileMenu->addAction(m_openAct);
diff -r f9b805d8cab4 -r 98a7fbbe9d88 src/panner.cpp
--- a/src/panner.cpp	Thu Mar 14 16:43:30 2013 +0000
+++ b/src/panner.cpp	Fri May 27 09:55:56 2016 +0100
@@ -59,7 +59,7 @@
             m = Qt::KeepAspectRatio;
         }
     }
-    DEBUG << "Panner: fit mode " << m << endl;
+    DEBUG << "Panner: fit mode " << int(m) << endl;
     fitInView(r, m);
 }