From: tbaudier Date: Tue, 10 Apr 2018 14:55:56 +0000 (+0200) Subject: change travis X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9425d920224b91bca5e987f2c1dc032a4e1603ba;p=clitk.git change travis --- diff --git a/travis/travis_build_qt.sh b/travis/travis_build_qt.sh index 38bb5a2..7fffb00 100755 --- a/travis/travis_build_qt.sh +++ b/travis/travis_build_qt.sh @@ -4,12 +4,6 @@ set -ev #Install the correct Qt Version if [ "$QT_VERSION" == "4.8.7" ]; then if test $TRAVIS_OS_NAME == linux ; then sudo apt-get -y --force-yes install qt4-dev-tools; fi - - if test $TRAVIS_OS_NAME == osx ; then brew install cartr/qt4/qt@4; fi - if test $TRAVIS_OS_NAME == osx ; then brew install cartr/qt4/qt-webkit@2.3; fi - if test $TRAVIS_OS_NAME == osx ; then brew link qt@4 --force; fi - if test $TRAVIS_OS_NAME == osx ; then brew link qt-webkit@2.3 --force; fi - if test $TRAVIS_OS_NAME == osx ; then qmake -v; fi elif [ "$QT_VERSION" == "5.5.1" ]; then if test $TRAVIS_OS_NAME == linux ; then sudo add-apt-repository --yes ppa:beineri/opt-qt551-trusty; fi if test $TRAVIS_OS_NAME == linux ; then sudo apt-get update -qq; fi @@ -17,6 +11,5 @@ elif [ "$QT_VERSION" == "5.5.1" ]; then 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