From 20c5c1a1caad10600bcad8a645d4e0852c74cbcc Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 17 Dec 2019 07:09:51 -0800 Subject: [PATCH 1/2] Move OSX to At 5.12.6 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f290e5..3df47af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -122,8 +122,8 @@ install: # osx dependencies: qt (master builds only: gstreamer, gstreamer-devel) - if [ "${SPEC}" = "macx-clang" ]; then - wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.11.0-clang_64-min.tar.bz2 && - tar jxf Qt5.11.0-clang_64-min.tar.bz2 -C /tmp + wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.12.6-clang_64-min.tar.bz2 && + tar jxf Qt5.12.6-clang_64-min.tar.bz2 -C /tmp ; fi @@ -134,7 +134,7 @@ install: fi - if [ "${SPEC}" = "macx-clang" ]; then - export QT_DIR=Qt5.11-clang_64/5.11.0/clang_64 && + export QT_DIR=Qt5.12-clang_64/5.12.6/clang_64 && export QT_QPA_PLATFORM_PLUGIN_PATH=/tmp/$QT_DIR/plugins && export QML2_IMPORT_PATH=/tmp/$QT_DIR/qml && export PATH=/tmp/$QT_DIR/bin:$PATH From fe7f17938d7e2070f969f4982747258a53df69db Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 17 Dec 2019 07:55:56 -0800 Subject: [PATCH 2/2] Remove custom add of ttx --- QGCInstaller.pri | 4 ---- 1 file changed, 4 deletions(-) diff --git a/QGCInstaller.pri b/QGCInstaller.pri index 2432ca1..d62c3d0 100644 --- a/QGCInstaller.pri +++ b/QGCInstaller.pri @@ -29,10 +29,6 @@ installer { # links to plugins will not be created correctly. QMAKE_POST_LINK += && cd $${DESTDIR} && $$dirname(QMAKE_QMAKE)/macdeployqt $${TARGET}.app -appstore-compliant -verbose=2 -qmldir=$${BASEDIR}/src - # macdeployqt does not deploy texttospeech plugin - QMAKE_POST_LINK += && mkdir $${TARGET}.app/Contents/PlugIns/texttospeech - QMAKE_POST_LINK += && cp $$[QT_INSTALL_PLUGINS]/texttospeech/libqtexttospeech_speechosx.dylib $${TARGET}.app/Contents/PlugIns/texttospeech - # macdeployqt is missing some relocations once in a while. "Fix" it: QMAKE_POST_LINK += && python $$BASEDIR/tools/osxrelocator.py $${TARGET}.app/Contents @rpath @executable_path/../Frameworks -r > /dev/null 2>&1