From 20341021c50af19a0f0dd7841ca6cbd2df21d0a6 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Wed, 23 Jan 2019 21:11:36 +0100
Subject: [PATCH] Update travis to use clang and g++7

---
 .travis.yml          | 25 ++++++++++++++++++++-----
 advancedSettings.pro |  4 ++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1223fc0..dbd7fa9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,24 @@
 language: cpp
 dist: xenial
-compiler:
-  - clang
-  - gcc
+
+matrix:
+  include:
+  - os: linux
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - g++-7
+    env:
+    - QMAKE_SPEC=linux-g++
+    
+  - os: linux
+    env:
+    - QMAKE_SPEC=linux-clang
+
+before_install:
+  - python ./build_scripts/run-clang-format.py ./src -r --color always  
 
 install:
   - sudo add-apt-repository ppa:kubuntu-ppa/backports -y
@@ -10,7 +26,6 @@ install:
   - sudo apt-get install build-essential qtbase5-dev qttools5-dev qtdeclarative5-dev qtmultimedia5-dev qt5-default qttools5-dev-tools
 
 script:
-  - python ./build_scripts/run-clang-format.py ./src -r --color always
   - mkdir build && cd build
-  - qmake ..
+  - qmake .. -spec $QMAKE_SPEC
   - make
diff --git a/advancedSettings.pro b/advancedSettings.pro
index 3b9f7ff..18aecae 100644
--- a/advancedSettings.pro
+++ b/advancedSettings.pro
@@ -40,7 +40,10 @@ win32-clang-msvc{
 }
 
 *g++* {
+    #g++-7 is needed for C++17 features. travis does not supply this by default.
+    QMAKE_CXX = g++-7
     QMAKE_CXXFLAGS += -Werror
+    QMAKE_CXXFLAGS += -std=c++17
 }
 
 #Look for anything clang that is not clang-msvc, since it does not
@@ -49,6 +52,7 @@ win32-clang-msvc{
     QMAKE_CXXFLAGS += -Werror
     #All includes from the third-party directory will not warn.
     QMAKE_CXXFLAGS += --system-header-prefix=third-party
+    QMAKE_CXXFLAGS += -std=c++17
 }
 SOURCES += src/main.cpp\
     src/overlaycontroller.cpp \