X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=travis%2Ftravis_build_qt.sh;h=12e137bcc21a01f35424ede97b81d0ff868be625;hb=69dacfe0651ee24bef0f9e6b41171b9eec96fd2e;hp=7b3ef0bb54c84814040528014b82b19d05f79dc6;hpb=c91252d780814d0d771464cdbce0f0a2cf94e891;p=clitk.git

diff --git a/travis/travis_build_qt.sh b/travis/travis_build_qt.sh
index 7b3ef0b..12e137b 100755
--- a/travis/travis_build_qt.sh
+++ b/travis/travis_build_qt.sh
@@ -4,20 +4,12 @@ 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
-  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
+  if test $TRAVIS_OS_NAME == linux ; then sudo apt-get -y --force-yes install qt55tools qt55x11extras; 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