diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-12 09:57:52 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-15 11:49:29 +0000 |
commit | 410740fc0ea11a78e2fd6d934f2ff79e2fbb3fb8 (patch) | |
tree | cf939097ff15ab5472d8a889d9d73a79df238d3b | |
parent | e449b51d8c3d0a949e6d6d268e70ae5cbbe5d263 (diff) | |
download | qbs-410740fc0ea11a78e2fd6d934f2ff79e2fbb3fb8.tar.gz |
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>
-rw-r--r-- | qbs-resources/imports/QbsAutotest.qbs | 2 | ||||
-rw-r--r-- | qbs-resources/imports/QbsProduct.qbs | 2 | ||||
-rw-r--r-- | src/app/app.pri | 2 | ||||
-rw-r--r-- | src/lib/library.pri | 2 | ||||
-rw-r--r-- | src/libexec/qbs_processlauncher/qbs_processlauncher.pro | 2 | ||||
-rw-r--r-- | src/plugins/plugins.pri | 2 | ||||
-rw-r--r-- | src/shared/json/json.qbs | 2 | ||||
-rw-r--r-- | tests/auto/auto.pri | 2 | ||||
-rw-r--r-- | tests/benchmarker/benchmarker.pro | 2 | ||||
-rw-r--r-- | tests/benchmarker/benchmarker.qbs | 2 | ||||
-rw-r--r-- | tests/fuzzy-test/fuzzy-test.qbs | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/qbs-resources/imports/QbsAutotest.qbs b/qbs-resources/imports/QbsAutotest.qbs index b709cbce8..25720354e 100644 --- a/qbs-resources/imports/QbsAutotest.qbs +++ b/qbs-resources/imports/QbsAutotest.qbs @@ -17,7 +17,7 @@ QtApplication { "../../../src", "../../../src/app/shared", // for the logger ] - cpp.cxxLanguageVersion: "c++11" + cpp.cxxLanguageVersion: "c++14" destinationDirectory: "bin" Group { name: "logging" diff --git a/qbs-resources/imports/QbsProduct.qbs b/qbs-resources/imports/QbsProduct.qbs index a9ae37aea..7425e1ea3 100644 --- a/qbs-resources/imports/QbsProduct.qbs +++ b/qbs-resources/imports/QbsProduct.qbs @@ -15,7 +15,7 @@ Product { res.push("QT_STRICT_ITERATORS"); return res; } - cpp.cxxLanguageVersion: "c++11" + cpp.cxxLanguageVersion: "c++14" cpp.enableExceptions: true cpp.rpaths: qbsbuildconfig.libRPaths } diff --git a/src/app/app.pri b/src/app/app.pri index 49bbd905b..d0c94a770 100644 --- a/src/app/app.pri +++ b/src/app/app.pri @@ -13,7 +13,7 @@ else:DESTDIR = ../../../bin CONFIG += console CONFIG -= app_bundle -CONFIG += c++11 +CONFIG += c++14 include($${PWD}/../lib/corelib/use_corelib.pri) include($${PWD}/shared/logging/logging.pri) diff --git a/src/lib/library.pri b/src/lib/library.pri index 63f48a9a7..4ae171c93 100644 --- a/src/lib/library.pri +++ b/src/lib/library.pri @@ -18,7 +18,7 @@ INCLUDEPATH += $${PWD}/../ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols win32:CONFIG(debug, debug|release):TARGET = $${TARGET}d CONFIG(debug, debug|release):DEFINES += QT_STRICT_ITERATORS -CONFIG += c++11 +CONFIG += c++14 CONFIG += create_prl qbs_disable_rpath { diff --git a/src/libexec/qbs_processlauncher/qbs_processlauncher.pro b/src/libexec/qbs_processlauncher/qbs_processlauncher.pro index 84142b5c5..1c98d97ae 100644 --- a/src/libexec/qbs_processlauncher/qbs_processlauncher.pro +++ b/src/libexec/qbs_processlauncher/qbs_processlauncher.pro @@ -1,7 +1,7 @@ include(../libexec.pri) TARGET = qbs_processlauncher -CONFIG += console c++11 +CONFIG += console c++14 CONFIG -= app_bundle QT = core network diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri index b0eede442..03fa5824a 100644 --- a/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri @@ -16,7 +16,7 @@ CONFIG(static, static|shared) { TEMPLATE = lib CONFIG += depend_includepath -CONFIG += c++11 +CONFIG += c++14 CONFIG += create_prl unix: CONFIG += plugin diff --git a/src/shared/json/json.qbs b/src/shared/json/json.qbs index ce2653394..56d208962 100644 --- a/src/shared/json/json.qbs +++ b/src/shared/json/json.qbs @@ -3,7 +3,7 @@ import qbs StaticLibrary { name: "qbsjson" Depends { name: "cpp" } - cpp.cxxLanguageVersion: "c++11" + cpp.cxxLanguageVersion: "c++14" cpp.minimumMacosVersion: "10.7" files: [ "json.cpp", diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri index 304202e0b..481118b98 100644 --- a/tests/auto/auto.pri +++ b/tests/auto/auto.pri @@ -9,7 +9,7 @@ INCLUDEPATH += $$PWD/../../src $$PWD/../../src/app/shared QT = core testlib CONFIG += depend_includepath testcase console CONFIG -= app_bundle -CONFIG += c++11 +CONFIG += c++14 target.CONFIG += no_default_install dev_lib_frameworks=$$QMAKE_XCODE_DEVELOPER_PATH/Library/Frameworks 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", diff --git a/tests/fuzzy-test/fuzzy-test.qbs b/tests/fuzzy-test/fuzzy-test.qbs index d12f0ba84..8dc468c4e 100644 --- a/tests/fuzzy-test/fuzzy-test.qbs +++ b/tests/fuzzy-test/fuzzy-test.qbs @@ -5,7 +5,7 @@ QtApplication { destinationDirectory: "bin" type: "application" consoleApplication: true - cpp.cxxLanguageVersion: "c++11" + cpp.cxxLanguageVersion: "c++14" files: [ "commandlineparser.cpp", "commandlineparser.h", |