From: tbaudier Date: Fri, 21 Apr 2017 07:22:32 +0000 (+0200) Subject: Update qt4 installation for Mac on Travis X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5a5cc7c517cc86cabe7880594ce27a5d99e57633;p=clitk.git Update qt4 installation for Mac on Travis --- diff --git a/travis/travis_build_qt.sh b/travis/travis_build_qt.sh index 6717a8c..7b3ef0b 100755 --- a/travis/travis_build_qt.sh +++ b/travis/travis_build_qt.sh @@ -6,7 +6,9 @@ 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