X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=.travis.yml;h=b68a233302addc3b086800fba1a85b312101bce6;hp=defbb623915089f906b92a04725aff7afe9a6615;hb=636a39a129df39cf34858170978a7cba550e369f;hpb=c33010eadab46ad7bceeb6605df0e918d0446ec4

diff --git a/.travis.yml b/.travis.yml
index defbb623..b68a2333 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,22 @@
-before_install:
-  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-  - sudo add-apt-repository -y ppa:kalakris/cmake
-  - sudo apt-add-repository -y ppa:beineri/opt-qt521
-  - sudo apt-get -qq update
+sudo: required
+dist: trusty
 
 install:
-  - sudo apt-get install -q gcc-4.7 g++-4.7
-  - if [ "$CXX" = "clang" ]; then sudo apt-get install -q clang-3.4; fi
-  - sudo apt-get install -q cmake
-  - sudo apt-get install -q qt52base qt52webkit qt52tools qt52script
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.7" CC="gcc-4.7"; fi
+  - sudo apt-get -qy install libqt5webkit5-dev qttools5-dev qtscript5-dev 
+  - sudo apt-get -qy install libdbusmenu-qt-dev libdbusmenu-qt5-dev
+  - sudo apt-get -qy install libphonon-dev libphonon4qt5-dev
+  - sudo apt-get -qy install libqca2-dev
+  - sudo apt-get -qy install qt4-dev-tools qttools5-dev-tools
+  - sudo apt-get -qy install libphonon4qt5experimental4 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=805096
 
 language: cpp
+cache: ccache
 
 compiler:
-  - gcc 
+  - gcc
   - clang
 
-env: 
+env:
   - QT_VERSION=qt4
   - QT_VERSION=qt5
 
@@ -25,5 +24,10 @@ script:
   - mkdir build
   - cd build
   - if [ "$QT_VERSION" = "qt4" ]; then cmake ..; fi
-  - if [ "$QT_VERSION" = "qt5" ]; then source /opt/qt52/bin/qt52-env.sh && cmake  -DUSE_QT5=ON ..; fi
-  - make
\ No newline at end of file
+  - if [ "$QT_VERSION" = "qt5" ]; then cmake -DUSE_QT5=ON ..; fi
+  - make
+
+matrix:
+  exclude:
+    - compiler: clang
+      env: QT_VERSION=qt4