diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-05-05 14:04:39 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-05-07 14:51:57 +0000 |
| commit | 552ed73a50498dd682832830d8dd500a09d97e4b (patch) | |
| tree | 894987ce4a05802fb9b0bab7305bc1be9e8789e9 | |
| parent | 3f80c821e939cd908651d20940fb41b2522dc199 (diff) | |
Fix building iOS-simulator apps when qbs.architecture is undefined
QtCreator does not set the qbs.architecture property for the ios-
simulator and the condition check for the Qt modules fails.
Task-number: QBS-838
Change-Id: I39fe4ad75d3261a6b83f81bf0593ee9445bcefd8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/core.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/module-providers/Qt/templates/core.qbs b/share/qbs/module-providers/Qt/templates/core.qbs index b2f05d8e9..63d9a4cb5 100644 --- a/share/qbs/module-providers/Qt/templates/core.qbs +++ b/share/qbs/module-providers/Qt/templates/core.qbs @@ -13,7 +13,7 @@ Module { || architectures.contains(qbs.architecture)) readonly property bool isCombinedUIKitBuild: ["ios", "tvos", "watchos"].contains(targetPlatform) - && ["x86", "x86_64"].contains(qbs.architecture) + && (!qbs.architecture || ["x86", "x86_64"].contains(qbs.architecture)) && qbs.targetPlatform === targetPlatform + "-simulator" Depends { name: "cpp" } |