diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-08-18 10:47:11 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-08-19 07:23:24 +0000 |
| commit | 60b28789ebbab72ed9232643a8216264f7924ddf (patch) | |
| tree | 085408fde86e66962a181e5f8add11a40c8d8e37 | |
| parent | cacad5f881b7621eeffe9eeb11ad31f741c5d6c4 (diff) | |
Qt.core: Default to C++11 for version 5.7 and abovev1.6.0
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 <jake.petroules@qt.io>
| -rw-r--r-- | src/lib/qtprofilesetup/templates/core.qbs | 2 |
1 files changed, 2 insertions, 0 deletions
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 |