diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2018-05-15 11:32:23 +0200 |
|---|---|---|
| committer | Anne Jan Brouwer <brouwer@annejan.com> | 2018-05-15 11:32:23 +0200 |
| commit | d2b4634f40b6c8d7cd14bc002346d9ff2620a707 (patch) | |
| tree | 9a76d1f6e192cac797089cf6a92d11c4de54ad01 /.travis.yml | |
| parent | 9417703048367e344ae0a70bfef36f8a8dc2ec28 (diff) | |
Travis build updated to Qt 5.10.1
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 707c6fdf..a9ca3086 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: global: secure: WaZq3f6KIAc0dnR4WOXYWDvUYiqlrzsZC/PQse47FnvC0oQC65J5w3kJOj/P26DgsUEqKQF3ukXogkM2mp5pS4+CMgivEmQmAbgQTtwcKpC5HPZxgI+8FgkCjcalJKWGWYoxlScNVNiKMs+89ApcSQE9kH9PZeUS9dukN2Php1U= before_install: -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt592-trusty; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt-5.10.1-trusty; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi addons: coverity_scan: @@ -30,7 +30,7 @@ install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install pandoc; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then npm install -g appdmg; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt59base qt59tools qt59svg; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt510base qt510tools qt510svg; fi - if [[ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]]; then sudo apt-get -qq install g++-6 gcc-6; fi - if [[ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-6; fi - if [[ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]]; then sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-6 90; fi @@ -38,7 +38,7 @@ install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then gem install coveralls-lcov; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install lcov; fi before_script: -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt59/bin/qt59-env.sh; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt510/bin/qt510-env.sh; fi - qmake -v script: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then qmake CONFIG+=coverage -Wall qtpass.pro; fi |