X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=travis%2Ftravis_build_qt.sh;h=12e137bcc21a01f35424ede97b81d0ff868be625;hb=20147f097d36f54eae548368df24f577e5567677;hp=38bb5a24a254877dd3dcbc59cd1251ca161a53cc;hpb=03a3dde77c4de04ce6f0af2f8d6eda4cf0fb6e41;p=clitk.git

diff --git a/travis/travis_build_qt.sh b/travis/travis_build_qt.sh
index 38bb5a2..12e137b 100755
--- a/travis/travis_build_qt.sh
+++ b/travis/travis_build_qt.sh
@@ -4,19 +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 == 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
-if test $TRAVIS_OS_NAME == osx ; then brew linkapps qt5; fi