diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-28 12:16:10 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-28 12:50:11 +0000 |
| commit | ff2b76e82b6eb1b478383fffee49236d9e5e8bf4 (patch) | |
| tree | 389b204bd19b91bc8abeb987bdb3f6ef18e17332 /src/lib/qtprofilesetup | |
| parent | 1f98a8c321993f21918c9d85c653d5f20e6a35ad (diff) | |
Qt modules: Do not disable the arch check for modules with no library
Otherwise dependencies on private Qt modules will be ambiguous for e.g.
Qt Android profiles with more than one architecture. The architecture
property is always set, so this change does not erroneously turn
conditions to false.
Change-Id: I30de95493943c8d90a76f7b22b65d4d69a19c29b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/qtprofilesetup')
| -rw-r--r-- | src/lib/qtprofilesetup/templates/QtModule.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/qtprofilesetup/templates/QtModule.qbs b/src/lib/qtprofilesetup/templates/QtModule.qbs index 56f80de6a..82ac6eef5 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) |