diff options
author | Mike Krus <mike.krus@kdab.com> | 2016-03-07 20:11:11 +0000 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2016-05-05 02:08:51 +0000 |
commit | 7c7d8f870e028bd288dee6b2cab9869e17794ce9 (patch) | |
tree | d5cc7827e86f696f5794b9566dc414d890337ac4 /mkspecs/features/uikit/qt_config.prf | |
parent | 6fb56a74c87c49341f2313f2dfc2f526e498fede (diff) |
Refactor iOS builds to facilitate tvOS port
- moved prf files to shared location (uikit, added to QMAKE_PLATFORM)
- prepare some formatting (unconditional blocks mostly) to add conditions later
- make device detection script more generic, passing filter strings
as a parameter and returning non-os specific variables
Change-Id: I61f2b77093304ff985bec9da04fda57ff296b16b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'mkspecs/features/uikit/qt_config.prf')
-rw-r--r-- | mkspecs/features/uikit/qt_config.prf | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mkspecs/features/uikit/qt_config.prf b/mkspecs/features/uikit/qt_config.prf new file mode 100644 index 0000000000..00e2c0c258 --- /dev/null +++ b/mkspecs/features/uikit/qt_config.prf @@ -0,0 +1,17 @@ +load(qt_config) + +isEmpty(QT_ARCH) { + # The configure tests are run without QT_ARCH being resolved yet, which + # means we fail to pass -arch to the compiler, resulting in broke tests. + # As the Xcode toolchain doesn't seem to have a way to auto-detect the + # arch based on the SDK, we have to hard-code the arch for configure. + contains(QMAKE_MAC_SDK, $${device.sdk}.*) { + QT_ARCH = arm + } else { # Simulator + QT_ARCH = i386 + } + + # Prevent the arch/config tests from building as multi-arch binaries, + # as we only want the lowest common denominator features. + CONFIG += single_arch +} |