X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=travis%2Ftravis_build_qt.sh;h=7b3ef0bb54c84814040528014b82b19d05f79dc6;hb=1865f86b7420682f57e160c911cfebabbfaa8375;hp=455eb73e3eda55320375a1d9865c5b707a58a96f;hpb=96466b419b3e7e0fcc74290840efa04051b2c3f8;p=clitk.git diff --git a/travis/travis_build_qt.sh b/travis/travis_build_qt.sh index 455eb73..7b3ef0b 100755 --- a/travis/travis_build_qt.sh +++ b/travis/travis_build_qt.sh @@ -5,8 +5,10 @@ set -ev 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; fi - if test $TRAVIS_OS_NAME == osx ; then brew link qt --force; 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