diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-06-22 10:35:27 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-06-23 17:28:58 +0000 |
| commit | 7ff48935e8720410763bad9caff8b1e32d22017d (patch) | |
| tree | 9363e0f0a14aee4ecb12ed282329f1a3e62c7d0c | |
| parent | 2c55c10cac8a72b8c779fece3aef8beb3cc2377b (diff) | |
Explicitly specify the minimum macOS version in the qtcjson library
Also don't set the value in more than one place.
Change-Id: Iea1dc1d4e127c12d6333799dda91749eb2d604d4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 2 | ||||
| -rw-r--r-- | qtcreator.qbs | 1 | ||||
| -rw-r--r-- | src/shared/json/json.qbs | 1 | ||||
| -rw-r--r-- | src/tools/valgrindfake/valgrindfake.qbs | 7 |
4 files changed, 10 insertions, 1 deletions
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index 52e63f1f6f..d89dbd1635 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -22,7 +22,7 @@ Product { Properties { condition: Utilities.versionCompare(Qt.core.version, "5.7") < 0 - cpp.minimumMacosVersion: "10.8" + cpp.minimumMacosVersion: project.minimumMacosVersion } cpp.cxxLanguageVersion: "c++14" diff --git a/qtcreator.qbs b/qtcreator.qbs index f28ba82a1a..3394719939 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -5,6 +5,7 @@ import qbs.FileInfo Project { name: "Qt Creator" minimumQbsVersion: "1.6.0" + property string minimumMacosVersion: "10.8" property bool withAutotests: qbs.buildVariant === "debug" property path ide_source_tree: path property pathList additionalPlugins: [] diff --git a/src/shared/json/json.qbs b/src/shared/json/json.qbs index 3587d307af..df11ab293a 100644 --- a/src/shared/json/json.qbs +++ b/src/shared/json/json.qbs @@ -4,6 +4,7 @@ StaticLibrary { name: "qtcjson" Depends { name: "cpp" } cpp.cxxLanguageVersion: "c++11" + cpp.minimumMacosVersion: project.minimumMacosVersion files: [ "json.cpp", "json.h", diff --git a/src/tools/valgrindfake/valgrindfake.qbs b/src/tools/valgrindfake/valgrindfake.qbs index e71fba1358..7348b1d8af 100644 --- a/src/tools/valgrindfake/valgrindfake.qbs +++ b/src/tools/valgrindfake/valgrindfake.qbs @@ -1,4 +1,5 @@ import qbs +import qbs.Utilities CppApplication { name: "valgrind-fake" @@ -7,6 +8,12 @@ CppApplication { Depends { name: "Qt"; submodules: ["network", "xml"]; } Depends { name: "qtc" } cpp.cxxLanguageVersion: "c++11" + + Properties { + condition: Utilities.versionCompare(Qt.core.version, "5.7") < 0 + cpp.minimumMacosVersion: project.minimumMacosVersion + } + files: [ "main.cpp", "outputgenerator.h", "outputgenerator.cpp" |