]> Creatis software - clitk.git/commitdiff
Update qt4 installation for Mac on Travis
authortbaudier <thomas.baudier@creatis.insa-lyon.fr>
Fri, 21 Apr 2017 07:22:32 +0000 (09:22 +0200)
committertbaudier <thomas.baudier@creatis.insa-lyon.fr>
Fri, 21 Apr 2017 07:22:32 +0000 (09:22 +0200)
travis/travis_build_qt.sh

index 6717a8c4695ed45ea6e2fbb0854a82855d77c19a..7b3ef0bb54c84814040528014b82b19d05f79dc6 100755 (executable)
@@ -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