From 1852a1a016f383f9a2a6a550324f95ddd1f7365d Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Tue, 28 Mar 2017 10:56:43 -0700 Subject: [PATCH 1/2] Switch OS X to 5.7 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 46ca93a..586da5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -115,7 +115,7 @@ install: # osx dependencies: qt, gstreamer, gstreamer-devel - if [ "${SPEC}" = "macx-clang" ]; then - wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.8.0-mac-clang-min.tar.bz2 && + wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.7.1-mac-clang-min.tar.bz2 && tar jxf Qt5.8.0-mac-clang-min.tar.bz2 -C /tmp && wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-1.5.2-x86_64.pkg && sudo installer -verboseR -pkg gstreamer-1.0-1.5.2-x86_64.pkg -target / && @@ -123,7 +123,7 @@ install: sudo installer -verboseR -pkg gstreamer-1.0-devel-1.5.2-x86_64.pkg -target / && wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/osx-gstreamer.tar.bz2 && sudo tar jxf osx-gstreamer.tar.bz2 -C /Library/Frameworks && - export QT_DIR=Qt5.8-mac-clang/5.8/clang_64 && + export QT_DIR=Qt5.7-mac-clang/5.7/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 c7511df2eaf1a3f88c25678342fd6f44bcd33850 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Tue, 28 Mar 2017 11:51:42 -0700 Subject: [PATCH 2/2] Missed one --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 586da5d..0ba09ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,7 +116,7 @@ install: # osx dependencies: qt, gstreamer, gstreamer-devel - if [ "${SPEC}" = "macx-clang" ]; then wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.7.1-mac-clang-min.tar.bz2 && - tar jxf Qt5.8.0-mac-clang-min.tar.bz2 -C /tmp && + tar jxf Qt5.7.1-mac-clang-min.tar.bz2 -C /tmp && wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-1.5.2-x86_64.pkg && sudo installer -verboseR -pkg gstreamer-1.0-1.5.2-x86_64.pkg -target / && wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-devel-1.5.2-x86_64.pkg &&