Skip to content

Q
qgroundcontrol
Commit 36e16418 authored by Daniel Agar's avatar Daniel Agar
Browse files
Options

travis-ci use homebrew qt 5.5.1

parent 388b5fdd
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
.travis.yml
View file @ 36e16418
...@@ -61,11 +61,9 @@ install: ...@@ -61,11 +61,9 @@ install:
&& sh -e /etc/init.d/xvfb start && sh -e /etc/init.d/xvfb start
; ;
elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
brew tap PX4/homebrew-px4 brew update
&& brew update && brew install qt5
&& brew install qt54 && export PATH=/usr/local/opt/qt5/bin:$PATH
&& brew linkapps qt54
&& export PATH=/usr/local/opt/qt54/bin:$PATH
; ;
elif [ "${TRAVIS_OS_NAME}" = "android" ]; then elif [ "${TRAVIS_OS_NAME}" = "android" ]; then
wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin
......
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