summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDane Springmeyer <dane@mapbox.com>2016-11-11 17:03:46 -0800
committerDane Springmeyer <dane@mapbox.com>2016-11-11 17:03:46 -0800
commite52ea154c71934662527e7497b5b70981fb8a42b (patch)
tree3b297156c0c92f218cf6470f73e9959d4b684623
parent4240cae4349eee4c49f522ca29983826ced0f134 (diff)
downloadqtlocation-mapboxgl-e52ea154c71934662527e7497b5b70981fb8a42b.tar.gz
back to trusty for qt packages
-rw-r--r--.travis.yml10
1 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 6c452900ea..b2b3198ddf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -127,8 +127,9 @@ matrix:
# Qt 4 - Release
- os: linux
- sudo: false
- dist: precise
+ # sudo:false depends on https://github.com/travis-ci/apt-package-whitelist/issues/3621
+ sudo: required
+ dist: trusty
language: cpp
compiler: "qt4-gcc5-release"
env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 RUN_XVFB=1 WITH_QT_4=1
@@ -139,8 +140,9 @@ matrix:
# Qt 5 - Release
- os: linux
- sudo: false
- dist: precise
+ # sudo:false depends on https://github.com/travis-ci/apt-package-whitelist/issues/3622
+ sudo: required
+ dist: trusty
language: cpp
compiler: "qt5-gcc5-release"
env: BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 RUN_XVFB=1