From b1014408917dd900f029924802433321f1eb5ac4 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Mon, 25 Dec 2017 19:01:55 +0900
Subject: Fix CI

Old GCC was still invoked; qmake-based builds weren't switched to C++14.
---
 .travis.yml          | 17 ++++++++++-------
 libqmatrixclient.pri |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f033f3dd..e4d66084 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,5 @@
 language: cpp
 
-os: [ linux, osx ]
-
-compiler: [ gcc, clang ]
-
 addons:
   apt:
     sources:
@@ -14,10 +10,17 @@ addons:
     - qt56base
 
 matrix:
-  exclude: [ { os: osx, compiler: gcc } ]
+  include:
+  - os: linux
+    compiler: gcc
+    env: [ ENV_EVAL="CC=gcc-5 && CXX=g++-5" ]
+  - os: linux
+    compiler: clang
+  - os: osx
+    env: [ ENV_EVAL="brew update && brew install qt5 && PATH=/usr/local/opt/qt/bin" ]
 
-install:
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; brew install qt5; export PATH="$PATH:/usr/local/opt/qt/bin"; fi
+before_install:
+- eval "${ENV_EVAL}"
 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then . /opt/qt56/bin/qt56-env.sh; fi
 
 script:
diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri
index 49442197..414e3c08 100644
--- a/libqmatrixclient.pri
+++ b/libqmatrixclient.pri
@@ -1,5 +1,5 @@
 QT += network
-CONFIG += c++11 warn_on rtti_off
+CONFIG += c++14 warn_on rtti_off
 
 INCLUDEPATH += $$PWD
 
-- 
cgit v1.2.3