diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-17 13:42:03 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-18 08:27:58 +0000 |
| commit | e68418f22ed9d0e2e9fbec99a4e500f34e30fba8 (patch) | |
| tree | 4869957db232c8326385846ddbdb33cd49fc4c36 | |
| parent | f15646622a57e60280f859843435731622863a7b (diff) | |
| download | qt-creator-e68418f22ed9d0e2e9fbec99a4e500f34e30fba8.tar.gz | |
qbs build: Set minimum macOS deployment target unconditionally
The previous construct left the value undefined for Qt < 5.7.
Task-number: QTCREATORBUG-19602
Change-Id: I6e6e5b0d3fb4ec76593c50bb13bad49f83b50dcc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -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 c6b130effe..4e3c8b0d49 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -21,10 +21,10 @@ Product { Depends { name: "qtc" } Depends { name: product.name + " dev headers"; required: false } - 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") |