diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-02 12:39:50 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-02 12:39:50 +0100 |
| commit | d7cfd25e401cf55bc7a19f15779f05cd4b69b6d2 (patch) | |
| tree | f6d5207f96e6274e1463c5ca3bac2cab5ea063c2 /src/lib/qtprofilesetup | |
| parent | b8ce406bad97dea7e355dbf10dc3681839855845 (diff) | |
| parent | d447d42bf2684b6021ec8238f46b59dc7a31b9ce (diff) | |
Merge 1.11 into master
Change-Id: Ided96fe9c47e59b08efdcc314d97ecd164d12b23
Diffstat (limited to 'src/lib/qtprofilesetup')
| -rw-r--r-- | src/lib/qtprofilesetup/templates/QtModule.qbs | 2 | ||||
| -rw-r--r-- | src/lib/qtprofilesetup/templates/core.qbs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/qtprofilesetup/templates/QtModule.qbs b/src/lib/qtprofilesetup/templates/QtModule.qbs index 0daf02fda..fcc8797cb 100644 --- a/src/lib/qtprofilesetup/templates/QtModule.qbs +++ b/src/lib/qtprofilesetup/templates/QtModule.qbs @@ -5,7 +5,7 @@ Module { condition: (qbs.targetPlatform === targetPlatform || isCombinedUIKitBuild) && (!qbs.architecture || architectures.length === 0 - || architectures.contains(qbs.architecture) || !hasLibrary) + || architectures.contains(qbs.architecture)) readonly property bool isCombinedUIKitBuild: ["ios", "tvos", "watchos"].contains(targetPlatform) && ["x86", "x86_64"].contains(qbs.architecture) diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs index 6741f8bcf..968f3efa0 100644 --- a/src/lib/qtprofilesetup/templates/core.qbs +++ b/src/lib/qtprofilesetup/templates/core.qbs @@ -11,7 +11,7 @@ Module { condition: (qbs.targetPlatform === targetPlatform || isCombinedUIKitBuild) && (!qbs.architecture || architectures.length === 0 - || architectures.contains(qbs.architecture) || !hasLibrary) + || architectures.contains(qbs.architecture)) readonly property bool isCombinedUIKitBuild: ["ios", "tvos", "watchos"].contains(targetPlatform) && ["x86", "x86_64"].contains(qbs.architecture) |