travis: Use Qt 5 on Ubuntu CI builds

2016-06-17 09:03:30 +07:00 · 2016-06-17 09:03:30 +07:00 · c283a8509d
parent 251457b9d5
commit c283a8509d
2 changed files with 11 additions and 7 deletions
--- a/.travis-build.sh
+++ b/.travis-build.sh
@ -16,7 +16,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
    export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH

    mkdir build && cd build
-    cmake -DCITRA_FORCE_QT4=ON ..
+    cmake ..
    make -j4

    ctest -VV -C Release
--- a/.travis.yml
+++ b/.travis.yml
@ -1,15 +1,17 @@
-os:
-  - linux
-  - osx
-
 language: cpp

+matrix:
+  include:
+    - os: linux
+      sudo: true
+      dist: trusty
+    - os: osx
+      sudo: false
+
 env:
  global:
    - secure: "AXHFIafTmbGDsHD3mUVj5a4I397DQjti/WoqAJGUp2PglxTcc04BwxZ9Z+xLuf5N2Hs5r9ojAJLT8OGxJCLBDXzneQTNSqXbFuYSLbqrEAiIRlA9eRIotWCg+wYcO+5e8MKX+cHVKwiIWasUB21AtCdq6msh6Y3pUshZp212VPg="

-sudo: false
-
 addons:
  apt:
    sources:
@ -17,6 +19,8 @@ addons:
    packages:
      - gcc-5
      - g++-5
+      - qt5-default
+      - libqt5opengl5-dev
      - xorg-dev
      - lib32stdc++6 # For CMake
      - lftp # To upload builds