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
5833a839
Commit
5833a839
authored
Jan 12, 2018
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move Android to Qt 5.9.3
parent
555b8b99
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
.travis.yml
.travis.yml
+3
-3
QGCCommon.pri
QGCCommon.pri
+3
-1
No files found.
.travis.yml
View file @
5833a839
...
...
@@ -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.
1-android
-min.tar.bz2 &&
tar jxf Qt5.9.
1-android
-min.tar.bz2 -C /tmp &&
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/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
/5.9.1
/android_armv7/bin:`pwd`/android-ndk-r10e:$PATH && echo $PATH
export PATH=/tmp/Qt5.9-android
_armv7/5.9.3
/android_armv7/bin:`pwd`/android-ndk-r10e:$PATH && echo $PATH
;
fi
...
...
QGCCommon.pri
View file @
5833a839
...
...
@@ -235,7 +235,9 @@ ReleaseBuild {
DEFINES += QT_NO_DEBUG QT_MESSAGELOGCONTEXT
CONFIG += force_debug_info # Enable debugging symbols on release builds
!iOSBuild {
CONFIG += ltcg # Turn on link time code generation
!AndroidBuild {
CONFIG += ltcg # Turn on link time code generation
}
}
WindowsBuild {
...
...
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