diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-22 12:46:10 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-22 12:46:10 +0100 |
| commit | 8921888ce37494ff74716394f5187034b2d7cffd (patch) | |
| tree | 3518b62ee63deedd3bc50d9b7069d35836201536 /qbs/imports | |
| parent | cf94a15379ad72d0892c76bbdeff1a117e49cf31 (diff) | |
| parent | fdb95299c67b195d46cd3b7a37ed5118809e9a57 (diff) | |
| download | qt-creator-8921888ce37494ff74716394f5187034b2d7cffd.tar.gz | |
Merge remote-tracking branch 'origin/4.5' into 4.6
Conflicts:
src/shared/qbs
Change-Id: I5314559cbf188e4c339de44052c6e0c89d3c2aa6
Diffstat (limited to 'qbs/imports')
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index cd3bee3297..fc6c2502e4 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -22,10 +22,10 @@ Product { Depends { name: product.name + " dev headers"; required: false } Depends { name: "Qt.core"; versionAtLeast: "5.6.2" } - Properties { - condition: Utilities.versionCompare(Qt.core.version, "5.7") < 0 - cpp.minimumMacosVersion: project.minimumMacosVersion - } + // TODO: Should fall back to what came from Qt.core for Qt < 5.7, but we cannot express that + // atm. Conditionally pulling in a module that sets the property is also not possible, + // because conflicting scalar values would be reported (QBS-1225 would fix that). + cpp.minimumMacosVersion: project.minimumMacosVersion Properties { condition: qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang") |