diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2019-08-12 15:38:36 +0200 |
|---|---|---|
| committer | Anne Jan Brouwer <brouwer@annejan.com> | 2019-08-12 15:38:36 +0200 |
| commit | f14664478f0c93ef6d07ce3da8d64c10e83140e8 (patch) | |
| tree | e0394d526390976b5b6e71ffbbb8b7e7ebf1ba25 | |
| parent | dc6eb93acd52bdd5db40a265f6bb5aee7df5b718 (diff) | |
Updates travis to Qt 5.13 and 5.12
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index e2e116c5..c559c2ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then nvm use 12; 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 qt510base qt510tools qt510svg; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt512base qt512tools qt512svg; 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 @@ -40,7 +40,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/qt510/bin/qt510-env.sh; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt512/bin/qt512-env.sh; fi - qmake -v script: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then qmake CONFIG+=coverage -Wall qtpass.pro; fi |