feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qbs build: Set minimum macOS deployment target unconditionally

Browse Source 
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>
This commit is contained in:
Christian Kandeler
2018-01-17 13:42:03 +01:00
parent f15646622a
commit e68418f22e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qbs/imports/QtcProduct.qbs
View File

@@ -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
// 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")