diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-06-08 14:36:15 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-06-12 17:11:57 +0000 |
| commit | 5f45bb34ce49959c1b61d4af91402640d85cfd63 (patch) | |
| tree | 257405fe7c071fe6d78739a71a1e8c01355c9a56 /qbs | |
| parent | 6c6c4c72c6d211483066fbf9328f5fe5a06a8851 (diff) | |
| download | qt-creator-5f45bb34ce49959c1b61d4af91402640d85cfd63.tar.gz | |
Fix deployment target on macOS
According to the README, the minimum version is 10.8, but the code did
not reflect that reality.
Change-Id: I2bbaeefe614cba5b5fa8413b68202bb75f346d70
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcAutotest.qbs | 1 | ||||
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs index 03670f2902..bbef04d175 100644 --- a/qbs/imports/QtcAutotest.qbs +++ b/qbs/imports/QtcAutotest.qbs @@ -15,7 +15,6 @@ QtcProduct { project.buildDirectory + '/' + qtc.ide_library_path, project.buildDirectory + '/' + qtc.ide_plugin_path ] - cpp.minimumOsxVersion: "10.7" cpp.defines: base.filter(function(d) { return d != "QT_RESTRICTED_CAST_FROM_ASCII"; }) Group { diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index 690880d572..52e63f1f6f 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -1,5 +1,6 @@ import qbs 1.0 import qbs.FileInfo +import qbs.Utilities import QtcFunctions Product { @@ -19,9 +20,13 @@ Product { Depends { name: "qtc" } Depends { name: product.name + " dev headers"; required: false } + Properties { + condition: Utilities.versionCompare(Qt.core.version, "5.7") < 0 + cpp.minimumMacosVersion: "10.8" + } + cpp.cxxLanguageVersion: "c++14" cpp.defines: qtc.generalDefines - cpp.minimumOsxVersion: "10.7" cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2" cpp.useCxxPrecompiledHeader: useNonGuiPchFile || useGuiPchFile cpp.visibility: "minimal" |