aboutsummaryrefslogtreecommitdiffstats
path: root/tests/benchmarker
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-02-12 09:57:52 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-02-15 11:49:29 +0000
commit410740fc0ea11a78e2fd6d934f2ff79e2fbb3fb8 (patch)
treecf939097ff15ab5472d8a889d9d73a79df238d3b /tests/benchmarker
parente449b51d8c3d0a949e6d6d268e70ae5cbbe5d263 (diff)
Build qbs with C++14
This will enable us to simplify some of our templates. Qt Creator requires C++14 as well, so we won't break it. Change-Id: I577347ef12c53ff2ec59e88344ff181b27a0d50c Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/benchmarker')
-rw-r--r--tests/benchmarker/benchmarker.pro2
-rw-r--r--tests/benchmarker/benchmarker.qbs2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/benchmarker/benchmarker.pro b/tests/benchmarker/benchmarker.pro
index 4725e6684..5342e650c 100644
--- a/tests/benchmarker/benchmarker.pro
+++ b/tests/benchmarker/benchmarker.pro
@@ -2,7 +2,7 @@ TARGET = qbs_benchmarker
DESTDIR = ../../bin
CONFIG += console
CONFIG -= app_bundle
-CONFIG += c++11
+CONFIG += c++14
QT += concurrent
SOURCES = \
benchmarker-main.cpp \
diff --git a/tests/benchmarker/benchmarker.qbs b/tests/benchmarker/benchmarker.qbs
index 8dec56d60..a3ad96f7e 100644
--- a/tests/benchmarker/benchmarker.qbs
+++ b/tests/benchmarker/benchmarker.qbs
@@ -5,7 +5,7 @@ QtApplication {
destinationDirectory: "bin"
type: "application"
consoleApplication: true
- cpp.cxxLanguageVersion: "c++11"
+ cpp.cxxLanguageVersion: "c++14"
Depends { name: "Qt.concurrent" }
files: [
"activities.h",