From c283a8509d3edf79a6c8eaf3d709b41d545036b5 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 17 Jun 2016 09:03:30 -0400
Subject: [PATCH] travis: Use Qt 5 on Ubuntu CI builds
---
.travis-build.sh | 2 +-
.travis.yml | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/.travis-build.sh b/.travis-build.sh
index 511df04ac..9e9c59b7d 100755
--- 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
diff --git a/.travis.yml b/.travis.yml
index 8d86baece..06c00a162 100644
--- 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