diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-05-06 13:42:03 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-05-06 13:42:03 +0300 |
| commit | 3863561eb732d53e8c3b3b9e333a47bfb7aefab7 (patch) | |
| tree | 7ddb87615f58a79b08f5fd26fd4f300ca490fb45 /.travis.yml | |
| parent | ff080a0f4b18c9ab18fbac049ade84b8b2c6b00f (diff) | |
| download | qtlocation-mapboxgl-3863561eb732d53e8c3b3b9e333a47bfb7aefab7.tar.gz | |
[build] qtpositioning5-dev and qtlocation5-dev are now on Travis whitelist
Do not call `sudo` for installing them anymore. This will make it
possible to migrate to a container'ed Trusty bot when available.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 5aab7ae1b7..f224a17f32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ addons_shortcuts: addons_qt5: &qt5 apt: sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'gdb', 'g++-5', 'gcc-5', 'mesa-utils', 'qt5-default', 'libqt5opengl5-dev', 'qtdeclarative5-dev' ] + packages: [ 'gdb', 'g++-5', 'gcc-5', 'mesa-utils', 'qt5-default', 'libqt5opengl5-dev', 'qtdeclarative5-dev', 'qtpositioning5-dev', 'qtlocation5-dev' ] env: global: @@ -115,8 +115,6 @@ matrix: compiler: ": linux-gcc5-release" env: FLAVOR=qt5 BUILDTYPE=Release _CXX=g++-5 _CC=gcc-5 addons: *qt5 - before_install: - - sudo apt-get install -y qtpositioning5-dev qtlocation5-dev script: - make qt-app qt-qml-app |