From 26407aa1b826faccb5954da833431ee8992d8945 Mon Sep 17 00:00:00 2001 From: tbaudier Date: Thu, 26 Jan 2017 10:18:55 +0100 Subject: [PATCH] Travis: Change Qt5 version Force to use Qt5.5.1 instead of the updated brew formula --- .travis.yml | 4 ++-- travis/travis_build_qt.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 53f56fd..43121da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,8 +52,8 @@ install: - if test $TRAVIS_OS_NAME == linux; then sudo apt-get -y install libgdcm2-dev libpq-dev; fi - if test $TRAVIS_OS_NAME == linux; then if [[ "$QT_VERSION" == "5.5.1" ]] ; then QTDIR="/opt/qt55" && PATH="$PATH:$QTDIR/bin" && qt55-env.sh ; fi; fi - if test $TRAVIS_OS_NAME == osx ; then export HOMEBREW_QT_VERSION=$(brew list --versions qt | rev | cut -d' ' -f1 | rev); fi -- if test $TRAVIS_OS_NAME == osx ; then ln -s /usr/local/Cellar/qt5/$HOMEBREW_QT_VERSION/mkspecs /usr/local/mkspecs; fi -- if test $TRAVIS_OS_NAME == osx ; then ln -s /usr/local/Cellar/qt5/$HOMEBREW_QT_VERSION/plugins /usr/local/plugins; fi +- if test $TRAVIS_OS_NAME == osx ; then if [[ "$QT_VERSION" == "5.5.1" ]] ; then ln -s /usr/local/Cellar/qt@5.5/5.5.1/mkspecs /usr/local/mkspecs; fi; fi +- if test $TRAVIS_OS_NAME == osx ; then if [[ "$QT_VERSION" == "5.5.1" ]] ; then ln -s /usr/local/Cellar/qt@5.5/5.5.1/plugins /usr/local/plugins; fi; fi - if test $TRAVIS_OS_NAME == osx ; then qmake -v; fi cache: diff --git a/travis/travis_build_qt.sh b/travis/travis_build_qt.sh index 2bd9a31..455eb73 100755 --- a/travis/travis_build_qt.sh +++ b/travis/travis_build_qt.sh @@ -13,9 +13,9 @@ elif [ "$QT_VERSION" == "5.5.1" ]; then if test $TRAVIS_OS_NAME == linux ; then sudo apt-get update -qq; fi if test $TRAVIS_OS_NAME == linux ; then sudo apt-get -y --force-yes install qt55tools; fi - if test $TRAVIS_OS_NAME == osx ; then brew install qt5; fi - if test $TRAVIS_OS_NAME == osx ; then brew link qt5 --force; fi - if test $TRAVIS_OS_NAME == osx ; then brew linkapps qt5; fi + if test $TRAVIS_OS_NAME == osx ; then brew install qt@5.5; fi + if test $TRAVIS_OS_NAME == osx ; then brew link qt@5.5 --force; fi + if test $TRAVIS_OS_NAME == osx ; then brew linkapps qt@5.5; fi fi -- 2.45.1