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
b5e14ab6
Commit
b5e14ab6
authored
Mar 19, 2017
by
Don Gagne
Committed by
GitHub
Mar 19, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4800 from DonLakeFlyer/Linux5.7
Switch Linux builds to 5.7
parents
eeccb62f
bba9d798
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
.travis.yml
.travis.yml
+6
-6
QGCSetup.pri
QGCSetup.pri
+0
-1
No files found.
.travis.yml
View file @
b5e14ab6
...
...
@@ -89,9 +89,9 @@ before_install:
install
:
# linux dependencies: qt
-
if [ "${SPEC}" = "linux-g++-64" ]; then
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
8.0
-linux-min.tar.bz2 &&
tar jxf Qt5.
8.0
-linux-min.tar.bz2 -C /tmp &&
export PATH=/tmp/Qt5.
8-linux/5.8
/gcc_64/bin:$PATH &&
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
7.1
-linux-min.tar.bz2 &&
tar jxf Qt5.
7.1
-linux-min.tar.bz2 -C /tmp &&
export PATH=/tmp/Qt5.
7-linux/5.7
/gcc_64/bin:$PATH &&
export DISPLAY=:99.0 &&
sh -e /etc/init.d/xvfb start
;
...
...
@@ -99,8 +99,8 @@ install:
# android dependencies: qt, gstreamer, android-ndk
-
if [ "${SPEC}" = "android-g++" ]; then
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
8.0
-android-min.tar.bz2 &&
tar jxf Qt5.
8.0
-android-min.tar.bz2 -C /tmp &&
wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.
7.1
-android-min.tar.bz2 &&
tar jxf Qt5.
7.1
-android-min.tar.bz2 -C /tmp &&
wget 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 &&
...
...
@@ -109,7 +109,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.
8-android/5.8
/android_armv7/bin:`pwd`/android-ndk-r10e:$PATH && echo $PATH
export PATH=/tmp/Qt5.
7-android/5.7
/android_armv7/bin:`pwd`/android-ndk-r10e:$PATH && echo $PATH
;
fi
...
...
QGCSetup.pri
View file @
b5e14ab6
...
...
@@ -143,7 +143,6 @@ LinuxBuild {
imageformats \
platforminputcontexts \
platforms \
platformthemes \
position \
sqldrivers
...
...
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