diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-04-21 11:02:00 +0300 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@users.noreply.github.com> | 2016-04-21 11:02:00 +0300 |
commit | d46982be2b97b47ee14bb3adaae155fa7fec05f7 (patch) | |
tree | 0dc35592b9f8301a0edecbc70565c12dedaa90a3 /.travis.yml | |
parent | c625dd0f7e57e88acf9d988b84e48bdb99ffe4aa (diff) | |
download | qtlocation-mapboxgl-d46982be2b97b47ee14bb3adaae155fa7fec05f7.tar.gz |
Merge pull request #4773 from mapbox/travis-qt5
[build] Added Qt 5 build for Travis CI
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 4fbb04e7dd..19d358b106 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,12 @@ addons_shortcuts: sources: [ 'ubuntu-toolchain-r-test', 'ubuntu-sdk-team' ] packages: [ 'gdb', 'g++-4.9', 'gcc-4.9', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils', 'qt4-default' ] + addons_qt5: &qt5 + apt: + sources: [ 'ubuntu-toolchain-r-test', 'ubuntu-sdk-team' ] + packages: [ 'gdb', 'g++-4.9', 'gcc-4.9', 'libllvm3.4', 'xutils-dev', + 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils', + 'qt5-default', 'libqt5opengl5-dev' ] env: global: @@ -94,6 +100,14 @@ matrix: script: - make test-qt + # Qt 5 - Release + - language: cpp + compiler: ": linux-gcc49-release" + env: FLAVOR=qt5 BUILDTYPE=Release _CXX=g++-4.9 _CC=gcc-4.9 + addons: *qt5 + script: + - make test-qt + cache: directories: - $HOME/.ccache |