From 60b28789ebbab72ed9232643a8216264f7924ddf Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 18 Aug 2016 10:47:11 +0200 Subject: Qt.core: Default to C++11 for version 5.7 and above C++11 is required from Qt 5.7 on. Users shouldn't have to enable this manually in all their Qt-based products. Change-Id: I2cdbe393f62c9930cd74f129d0c14c109203425e Reviewed-by: Jake Petroules --- src/lib/qtprofilesetup/templates/core.qbs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs index e3352491c..b17935af4 100644 --- a/src/lib/qtprofilesetup/templates/core.qbs +++ b/src/lib/qtprofilesetup/templates/core.qbs @@ -1,6 +1,7 @@ import qbs 1.0 import qbs.FileInfo import qbs.ModUtils +import qbs.Utilities import "moc.js" as Moc import "qdoc.js" as Qdoc @@ -78,6 +79,7 @@ Module { property string qmBaseName: product.targetName property bool lreleaseMultiplexMode: false + cpp.cxxLanguageVersion: Utilities.versionCompare(version, "5.7.0") >= 0 ? "c++11" : original cpp.defines: { var defines = @defines@; // ### QT_NO_DEBUG must be added if the current build variant is derived -- cgit v1.2.3