diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-12 09:44:47 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-14 09:17:36 +0000 |
| commit | 9773ec85c6d3087de4f59bd3e9eb3e84a714c463 (patch) | |
| tree | bfe8cf0f0e68f89080e505bcd353d18d2e645cb8 /qbs-resources/imports | |
| parent | d97bad27e7acf400d57bcb593de98a458d3fec86 (diff) | |
| download | qbs-9773ec85c6d3087de4f59bd3e9eb3e84a714c463.tar.gz | |
qbs build: Set cpp.cxxLanguageVersion in QbsProduct
... rather than separately in the derived items.
Change-Id: I3f036ad45269daaa44aabfcd017c524083c84399
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'qbs-resources/imports')
| -rw-r--r-- | qbs-resources/imports/QbsApp.qbs | 1 | ||||
| -rw-r--r-- | qbs-resources/imports/QbsLibrary.qbs | 1 | ||||
| -rw-r--r-- | qbs-resources/imports/QbsProduct.qbs | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/qbs-resources/imports/QbsApp.qbs b/qbs-resources/imports/QbsApp.qbs index 429aac63c..9d4710219 100644 --- a/qbs-resources/imports/QbsApp.qbs +++ b/qbs-resources/imports/QbsApp.qbs @@ -12,7 +12,6 @@ QbsProduct { cpp.includePaths: [ "../shared", // for the logger ] - cpp.cxxLanguageVersion: "c++11" Group { fileTagsFilter: product.type .concat(qbs.buildVariant === "debug" ? ["debuginfo_app"] : []) diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs index f97b3aee0..986cc0318 100644 --- a/qbs-resources/imports/QbsLibrary.qbs +++ b/qbs-resources/imports/QbsLibrary.qbs @@ -15,7 +15,6 @@ QbsProduct { cpp.soVersion: version.replace(/\.\d+$/, '') } cpp.visibility: "minimal" - cpp.cxxLanguageVersion: "c++11" property bool visibilityType: Qt.core.staticBuild ? "static" : "dynamic" property string headerInstallPrefix: "/include/qbs" Group { diff --git a/qbs-resources/imports/QbsProduct.qbs b/qbs-resources/imports/QbsProduct.qbs index ff5915d00..a9ae37aea 100644 --- a/qbs-resources/imports/QbsProduct.qbs +++ b/qbs-resources/imports/QbsProduct.qbs @@ -15,6 +15,7 @@ Product { res.push("QT_STRICT_ITERATORS"); return res; } + cpp.cxxLanguageVersion: "c++11" cpp.enableExceptions: true cpp.rpaths: qbsbuildconfig.libRPaths } |