8ccb9096b9
Setting QT_ARCH when empty is a workaround for a missing qconfig.pri, since it hasn't been written yet by configure. As qconfig.pri is loaded by the generic qt_config.prf, putting our workaround in our own wrapper for qt_config makes sense, as it keeps the logic close to where the original QT_ARCH is resolved. Change-Id: I49ffc21cf5dea5ca5b6254ca8084a4dcdc359a72 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
13 lines
452 B
Plaintext
13 lines
452 B
Plaintext
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, iphoneos.*): \
|
|
QT_ARCH = arm
|
|
else: \ # Simulator
|
|
QT_ARCH = i386
|
|
}
|