# HG changeset patch
# User Chris Cannam
# Date 1394103773 0
# Node ID 40e6ba379f2cc854cac2c33678bd9cafdff64604
# Parent  360d3c7d63df910c7ecffe4753a73766095feffb
Unified toolbar, and version check

diff -r 360d3c7d63df -r 40e6ba379f2c .hgsubstate
--- a/.hgsubstate	Thu Mar 06 09:43:25 2014 +0000
+++ b/.hgsubstate	Thu Mar 06 11:02:53 2014 +0000
@@ -2,4 +2,4 @@
 27d4e7152c954bf3c4387319db088fb3cd02436b sv-dependency-builds
 f32fbb05d48c30e1e37285c9e1755d83f6d8954a svapp
 0c8218b2d84a172049d966c82c2064f5aa59c503 svcore
-1640a7c753cc8e85eea64286d7f5d218b6795d21 svgui
+0c1ef0d05c827cdbca6c746e815f8350777ade07 svgui
diff -r 360d3c7d63df -r 40e6ba379f2c src/MainWindow.cpp
--- a/src/MainWindow.cpp	Thu Mar 06 09:43:25 2014 +0000
+++ b/src/MainWindow.cpp	Thu Mar 06 11:02:53 2014 +0000
@@ -101,6 +101,12 @@
 {
     setWindowTitle(QApplication::applicationName());
 
+#ifdef Q_OS_MAC
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
+    setUnifiedTitleAndToolBarOnMac(true);
+#endif
+#endif
+
     UnitDatabase *udb = UnitDatabase::getInstance();
     udb->registerUnit("Hz");
     udb->registerUnit("dB");
@@ -2578,6 +2584,8 @@
     aboutText += tr("<p>%1 : %2 configuration</p>")
         .arg(version)
         .arg(debug ? tr("Debug") : tr("Release"));
+    aboutText += tr("<p>Using Qt version %1</p>")
+        .arg(QT_VERSION_STR);
 
     aboutText += 
         "<p>Copyright &copy; 2005&ndash;2013 Chris Cannam, Matthias Mauch, George Fazekas, and Queen Mary University of London.</p>"