# HG changeset patch # User Chris Cannam # Date 1481799745 0 # Node ID 2451e7bb90afd59fc5d694a4e00df87352e5b2da # Parent f013210eeceb12941828ccd1cf6ec391db7bdbd8 Small OSX fixes diff -r f013210eeceb -r 2451e7bb90af deploy/osx/copy-qt.sh --- 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 diff -r f013210eeceb -r 2451e7bb90af main/MainWindow.cpp --- 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 #include #include +#include #include #include #include