From 8ebe487c163a1f20f9a3d42a1cf70f2cf1d6e2fc Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Tue, 28 Jul 2020 00:11:31 +0200 Subject: qt6: Update cpp.cxxLanguageVersion in Qt templates Change-Id: Id3c2f6fddd0cc7d078963e50b07e0fb9b9ded5bb Fixes: QBS-1577 Reviewed-by: Christian Kandeler --- share/qbs/module-providers/Qt/templates/core.qbs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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: { -- cgit v1.2.1