Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
ed2fafb7
Unverified
Commit
ed2fafb7
authored
6 years ago
by
Don Gagne
Committed by
GitHub
6 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6529 from DonLakeFlyer/Qt5.11
Move Linux/Android to Qt 5.11.0
parents
9c25636c
bcd54012
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
7 deletions
+12
-7
.travis.yml
.travis.yml
+12
-7
No files found.
.travis.yml
View file @
ed2fafb7
...
@@ -73,9 +73,9 @@ before_install:
...
@@ -73,9 +73,9 @@ before_install:
install
:
install
:
# linux dependencies: qt
# linux dependencies: qt
-
if [ "${SPEC}" = "linux-g++-64" ]; then
-
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 &&
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
11.0
-gcc_64-min.tar.bz2 &&
tar jxf Qt5.
9.3
-gcc_64-min.tar.bz2 -C /tmp &&
tar jxf Qt5.
11.0
-gcc_64-min.tar.bz2 -C /tmp &&
export PATH=/tmp/Qt5.
9-gcc_64/5.9.3
/gcc_64/bin:$PATH &&
export PATH=/tmp/Qt5.
11-gcc_64/5.11.0
/gcc_64/bin:$PATH &&
export DISPLAY=:99.0 &&
export DISPLAY=:99.0 &&
sh -e /etc/init.d/xvfb start
sh -e /etc/init.d/xvfb start
;
;
...
@@ -83,8 +83,8 @@ install:
...
@@ -83,8 +83,8 @@ install:
# android dependencies: qt, gstreamer, android-ndk
# android dependencies: qt, gstreamer, android-ndk
-
if [ "${SPEC}" = "android-g++" ]; then
-
if [ "${SPEC}" = "android-g++" ]; then
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
9.3
-android_armv7-min.tar.bz2 &&
wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
11.0
-android_armv7-min.tar.bz2 &&
tar jxf Qt5.
9.3
-android_armv7-min.tar.bz2 -C /tmp &&
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 &&
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 &&
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 &&
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:
...
@@ -93,7 +93,7 @@ install:
./android-ndk-r10e-linux-x86_64.bin > /dev/null &&
./android-ndk-r10e-linux-x86_64.bin > /dev/null &&
export ANDROID_NDK_ROOT=`pwd`/android-ndk-r10e &&
export ANDROID_NDK_ROOT=`pwd`/android-ndk-r10e &&
export ANDROID_SDK_ROOT=/usr/local/android-sdk &&
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
fi
...
@@ -161,7 +161,12 @@ before_script:
...
@@ -161,7 +161,12 @@ before_script:
script
:
script
:
# run qmake
# run qmake
-
mkdir ${SHADOW_BUILD_DIR} && cd ${SHADOW_BUILD_DIR}
-
mkdir ${SHADOW_BUILD_DIR} && cd ${SHADOW_BUILD_DIR}
-
qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=WarningsAsErrorsOn -spec ${SPEC}
# Due to possible bug in Qt 5.11 WarningsAsErrorsOn is off for Linux builds. Hopefully back on once that is resolved.
-
if [ "${SPEC}" = "macx-clang" ]; then
qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=WarningsAsErrorsOn -spec ${SPEC}
else
qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} -spec ${SPEC}
fi
# compile
# compile
- if [ "${SPEC}" != "macx-ios-clang" ]; then
- if [ "${SPEC}" != "macx-ios-clang" ]; then
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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