Commit b38533c9 authored by Don Gagne's avatar Don Gagne

Merge pull request #3090 from DonLakeFlyer/TravisOSXQt

Travis: Use Qt5.5 download for OSX
parents 6e417447 68e195bd
...@@ -86,10 +86,13 @@ install: ...@@ -86,10 +86,13 @@ install:
&& sh -e /etc/init.d/xvfb start && sh -e /etc/init.d/xvfb start
; ;
elif [[ "${TRAVIS_OS_NAME}" = "osx" && "${SPEC}" != "ios" ]]; then elif [[ "${TRAVIS_OS_NAME}" = "osx" && "${SPEC}" != "ios" ]]; then
brew update; wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-mac-clang.tar.bz2
brew update && mkdir -p ~/qt
&& brew install qt5 && tar jxf Qt5.5.1-mac-clang.tar.bz2 -C ~/qt
&& export PATH=/usr/local/opt/qt5/bin:$PATH && export QT_DIR=Qt5.5-mac-clang/5.5/clang_64
&& export PATH=~/qt/$QT_DIR/bin:$PATH
&& export QT_QPA_PLATFORM_PLUGIN_PATH=~/qt/$QT_DIR/plugins
&& export QML2_IMPORT_PATH=~/qt/$QT_DIR/qml
; ;
elif [[ "${TRAVIS_OS_NAME}" = "osx" && "${SPEC}" = "ios" ]]; then elif [[ "${TRAVIS_OS_NAME}" = "osx" && "${SPEC}" = "ios" ]]; then
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-ios.tar.bz2 wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-ios.tar.bz2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment