X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=travis%2Ftravis_build_qt.sh;h=38bb5a24a254877dd3dcbc59cd1251ca161a53cc;hb=82b7d4913d5fbd074f7ab4cc641513546d9f39a4;hp=6717a8c4695ed45ea6e2fbb0854a82855d77c19a;hpb=1880ff272e077d15f51afbe4b971116671140822;p=clitk.git diff --git a/travis/travis_build_qt.sh b/travis/travis_build_qt.sh index 6717a8c..38bb5a2 100755 --- a/travis/travis_build_qt.sh +++ b/travis/travis_build_qt.sh @@ -6,16 +6,17 @@ 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 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 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 +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