diff --git a/.travis.yml b/.travis.yml index 47e8fe4232df16561e9583e217979c04fd2d0427..4b98ef788db1a159b3416810e82c5c91915356bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -161,7 +161,12 @@ before_script: script: # run qmake - 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 - if [ "${SPEC}" != "macx-ios-clang" ]; then