From 6adb0fd9dd76f0d0a17faeab41f819950a4347e1 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sun, 19 Mar 2017 12:35:00 -0700 Subject: [PATCH 1/3] Switch Linux builds to 5.7 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbb2485..123f4d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 ; From 2c4992a44d01d91ac4dee4e8589604490f3476c4 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sun, 19 Mar 2017 13:06:56 -0700 Subject: [PATCH 2/3] Add android --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 123f4d8..46ca93a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 From bba9d798a3e20c0f8e80777200e7749d7f073b76 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sun, 19 Mar 2017 13:47:54 -0700 Subject: [PATCH 3/3] Remove missing package --- QGCSetup.pri | 1 - 1 file changed, 1 deletion(-) diff --git a/QGCSetup.pri b/QGCSetup.pri index fa0b3e5..5328be0 100644 --- a/QGCSetup.pri +++ b/QGCSetup.pri @@ -143,7 +143,6 @@ LinuxBuild { imageformats \ platforminputcontexts \ platforms \ - platformthemes \ position \ sqldrivers