Mercurial > hg > sonic-visualiser

changeset 1432:2451e7bb90af levelpanwidget

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Small OSX fixes
author Chris Cannam
date Thu, 15 Dec 2016 11:02:25 +0000
parents f013210eeceb
children 02e5ba5cc889
files deploy/osx/copy-qt.sh main/MainWindow.cpp
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/deploy/osx/copy-qt.sh	Thu Dec 15 10:36:41 2016 +0000
+++ b/deploy/osx/copy-qt.sh	Thu Dec 15 11:02:25 2016 +0000
@@ -29,6 +29,12 @@
 echo
 echo "Copying frameworks..."
 for fwk in $frameworks; do
+    if [ ! -d "$qtdir/lib/$fwk.framework" ]; then
+	if [ "$fwk" = "QtDBus" ]; then
+	    echo "QtDBus.framework not found, assuming Qt was built without DBus support"
+	    continue
+	fi
+    fi
     cp -v "$qtdir/lib/$fwk.framework/$fwk" "$fdir" || exit 2
 done
 
--- a/main/MainWindow.cpp	Thu Dec 15 10:36:41 2016 +0000
+++ b/main/MainWindow.cpp	Thu Dec 15 11:02:25 2016 +0000
@@ -120,6 +120,7 @@
 #include <QCheckBox>
 #include <QRegExp>
 #include <QScrollArea>
+#include <QCloseEvent>
 #include <QDesktopServices>
 #include <QDialogButtonBox>
 #include <QFileSystemWatcher>