X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=.travis.yml;h=defbb623915089f906b92a04725aff7afe9a6615;hp=b99c62bb964c5416b559058b90c2e92bcf7c9e39;hb=08a36367b1f541736cede098e26eefca838b526a;hpb=e69f471077b6cc3ca719763892eaf31197ec1726

diff --git a/.travis.yml b/.travis.yml
index b99c62bb..defbb623 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,29 @@
+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
+
+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
+
 language: cpp
+
 compiler:
-  - gcc
+  - gcc 
   - clang
 
-before_install:
- - sudo add-apt-repository ppa:kalakris/cmake/test -y
- - sudo apt-get update -qq
- - sudo apt-get install cmake
- - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- - sudo apt-get update -qq
- - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.7; fi
- - if [ "$CXX" = "g++" ]; then export CXX="g++-4.7" CC="gcc-4.7"; fi
-
-script: mkdir build && cd build && cmake ../ && make
+env: 
+  - QT_VERSION=qt4
+  - QT_VERSION=qt5
+
+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