diff --git a/.travis.yml b/.travis.yml index 242fda72332e3489559d8926ca21e2aa06caa4e8..c634ee4a3d724a1b0cce8d926e19ff5003701574 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/QGCCommon.pri b/QGCCommon.pri index fd42cb0416704ddca05ab244ea86965abc8cd14e..f26540dd1752634c2cbe3f008bb88af726ac556c 100644 --- a/QGCCommon.pri +++ b/QGCCommon.pri @@ -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 {