diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-07-28 00:11:31 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-07-28 14:12:06 +0000 |
| commit | 8ebe487c163a1f20f9a3d42a1cf70f2cf1d6e2fc (patch) | |
| tree | 343c01bb171eef9af4a36286d4fdf4aae57cbee3 | |
| parent | 8e0b73568c5fe3df3b7b553e3b26357515c81893 (diff) | |
| download | qbs-8ebe487c163a1f20f9a3d42a1cf70f2cf1d6e2fc.tar.gz | |
qt6: Update cpp.cxxLanguageVersion in Qt templates
Change-Id: Id3c2f6fddd0cc7d078963e50b07e0fb9b9ded5bb
Fixes: QBS-1577
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/core.qbs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/share/qbs/module-providers/Qt/templates/core.qbs b/share/qbs/module-providers/Qt/templates/core.qbs index cb9d60c6c..10359e751 100644 --- a/share/qbs/module-providers/Qt/templates/core.qbs +++ b/share/qbs/module-providers/Qt/templates/core.qbs @@ -114,7 +114,9 @@ Module { cpp.linkerVariant: original } - cpp.cxxLanguageVersion: Utilities.versionCompare(version, "5.7.0") >= 0 ? "c++11" : original + cpp.cxxLanguageVersion: Utilities.versionCompare(version, "6.0.0") >= 0 + ? "c++17" + : Utilities.versionCompare(version, "5.7.0") >= 0 ? "c++11" : original cpp.enableCompilerDefinesByLanguage: ["cpp"].concat( qbs.targetOS.contains("darwin") ? ["objcpp"] : []) cpp.defines: { |