Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
b86ac62d
Commit
b86ac62d
authored
May 30, 2018
by
DonLakeFlyer
Browse files
Move Linux/Android to Qt 5.11.0
parent
11494b72
Changes
1
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
b86ac62d
...
...
@@ -73,9 +73,9 @@ before_install:
install
:
# linux dependencies: qt
-
if [ "${SPEC}" = "linux-g++-64" ]; then
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
9.3
-gcc_64-min.tar.bz2 &&
tar jxf Qt5.
9.3
-gcc_64-min.tar.bz2 -C /tmp &&
export PATH=/tmp/Qt5.
9
-gcc_64/5.
9.3
/gcc_64/bin:$PATH &&
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
11.0
-gcc_64-min.tar.bz2 &&
tar jxf Qt5.
11.0
-gcc_64-min.tar.bz2 -C /tmp &&
export PATH=/tmp/Qt5.
11
-gcc_64/5.
11.0
/gcc_64/bin:$PATH &&
export DISPLAY=:99.0 &&
sh -e /etc/init.d/xvfb start
;
...
...
@@ -83,8 +83,8 @@ install:
# android dependencies: qt, gstreamer, android-ndk
-
if [ "${SPEC}" = "android-g++" ]; then
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
9.3
-android_armv7-min.tar.bz2 &&
tar jxf Qt5.
9.3
-android_armv7-min.tar.bz2 -C /tmp &&
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
11.0
-android_armv7-min.tar.bz2 &&
tar jxf Qt5.
11.0
-android_armv7-min.tar.bz2 -C /tmp &&
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-android-armv7-1.5.2.tar.bz2 &&
mkdir -p ${TRAVIS_BUILD_DIR}/gstreamer-1.0-android-armv7-1.5.2 &&
tar jxf gstreamer-1.0-android-armv7-1.5.2.tar.bz2 -C ${TRAVIS_BUILD_DIR}/gstreamer-1.0-android-armv7-1.5.2 &&
...
...
@@ -93,7 +93,7 @@ install:
./android-ndk-r10e-linux-x86_64.bin > /dev/null &&
export ANDROID_NDK_ROOT=`pwd`/android-ndk-r10e &&
export ANDROID_SDK_ROOT=/usr/local/android-sdk &&
export PATH=/tmp/Qt5.
9
-android_armv7/5.
9.3
/android_armv7/bin:`pwd`/android-ndk-r10e:$PATH && echo $PATH
export PATH=/tmp/Qt5.
11
-android_armv7/5.
11.0
/android_armv7/bin:`pwd`/android-ndk-r10e:$PATH && echo $PATH
;
fi
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment