diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2020-08-20 19:37:30 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-08-21 12:03:43 +0000 |
commit | 7564963674363b5235554853ec3333de01f49499 (patch) | |
tree | f1c1cd8cf790bb6ebac5c73f5a9920e2f3e14dff | |
parent | 9c07cf8019fbf5920aa25c5e2634d009cc948ce8 (diff) |
Bump c++ version to the 17th standard
We can do that now as QtC moved to c++17 in master
Change-Id: I91d7fc425f1b288f341ee3025fec61a53e98c8d9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | qbs-resources/imports/QbsProduct.qbs | 2 | ||||
-rw-r--r-- | src/app/app.pri | 2 | ||||
-rw-r--r-- | src/lib/library_base.pri | 2 | ||||
-rw-r--r-- | src/libexec/qbs_processlauncher/qbs_processlauncher.pro | 2 | ||||
-rw-r--r-- | src/plugins/plugins.pri | 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 |
9 files changed, 9 insertions, 9 deletions
diff --git a/qbs-resources/imports/QbsProduct.qbs b/qbs-resources/imports/QbsProduct.qbs index 5f9d873e8..f1e4c81b7 100644 --- a/qbs-resources/imports/QbsProduct.qbs +++ b/qbs-resources/imports/QbsProduct.qbs @@ -19,7 +19,7 @@ Product { res.push("QT_STRICT_ITERATORS"); return res; } - cpp.cxxLanguageVersion: "c++14" + cpp.cxxLanguageVersion: "c++17" cpp.enableExceptions: true cpp.rpaths: qbsbuildconfig.libRPaths } diff --git a/src/app/app.pri b/src/app/app.pri index d0c94a770..5cd9cb4aa 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++14 +CONFIG += c++17 include($${PWD}/../lib/corelib/use_corelib.pri) include($${PWD}/shared/logging/logging.pri) diff --git a/src/lib/library_base.pri b/src/lib/library_base.pri index 093dcd39b..1fde46e3a 100644 --- a/src/lib/library_base.pri +++ b/src/lib/library_base.pri @@ -14,7 +14,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++14 +CONFIG += c++17 CONFIG += create_prl include(../../qbs_version.pri) diff --git a/src/libexec/qbs_processlauncher/qbs_processlauncher.pro b/src/libexec/qbs_processlauncher/qbs_processlauncher.pro index 1c98d97ae..c49e52e27 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++14 +CONFIG += console c++17 CONFIG -= app_bundle QT = core network diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri index b09619ca6..65de9bc10 100644 --- a/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri @@ -9,7 +9,7 @@ include($${PWD}/../lib/corelib/use_corelib.pri) TEMPLATE = lib -CONFIG += c++14 +CONFIG += c++17 CONFIG(static, static|shared): CONFIG += create_prl CONFIG += plugin diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri index fd8afad50..e46f7640a 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 += testcase console CONFIG -= app_bundle -CONFIG += c++14 +CONFIG += c++17 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 5342e650c..875cf1de0 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++14 +CONFIG += c++17 QT += concurrent SOURCES = \ benchmarker-main.cpp \ diff --git a/tests/benchmarker/benchmarker.qbs b/tests/benchmarker/benchmarker.qbs index 72b535b42..3a2654ff3 100644 --- a/tests/benchmarker/benchmarker.qbs +++ b/tests/benchmarker/benchmarker.qbs @@ -4,7 +4,7 @@ QtApplication { name: "qbs_benchmarker" type: "application" consoleApplication: true - cpp.cxxLanguageVersion: "c++14" + cpp.cxxLanguageVersion: "c++17" condition: Qt.concurrent.present Depends { name: "qbsbuildconfig" } Depends { diff --git a/tests/fuzzy-test/fuzzy-test.qbs b/tests/fuzzy-test/fuzzy-test.qbs index 539374deb..8ec0f792d 100644 --- a/tests/fuzzy-test/fuzzy-test.qbs +++ b/tests/fuzzy-test/fuzzy-test.qbs @@ -5,7 +5,7 @@ QtApplication { type: "application" consoleApplication: true Depends { name: "qbsbuildconfig" } - cpp.cxxLanguageVersion: "c++14" + cpp.cxxLanguageVersion: "c++17" files: [ "commandlineparser.cpp", "commandlineparser.h", |