9082cc8e8d
The qmake variable QMAKE_APPLE_DEVICE_ARCHS was added for iOS, to support universal builds, as the QT_ARCH is a single value. Since the qmake macOS builds are non-universal (at the moment), we remove the hard-coded value for QMAKE_APPLE_DEVICE_ARCHS on macOS, and let the normal architecture test resolve the arch, like on other platforms. To ensure that the following configuration tests are run with an -arch argument, we trigger a commit of the preliminary Qt configuration after running the architecture test. This is not strictly necessary, but makes it clearer what's going on during configure. The device_and_simulator configuration option was used by the iOS toolchain, and needed to be moved up in the configuration test order to not break later tests. The logic in mac/default_post.prf for both Xcode and Makefiles to add -arch flags was kept as is, based on the existing variable, to avoid too many changes to this logic. The logic in toolchain.prf was amended to make it clear and ensure that it only applies to iOS builds. macOS builds do not have this issue. Pick-to: 6.0 Pick-to: 5.15 Pick-to: 5.12 Change-Id: I70db7e4c27f0d3da5d0af33cb491d72c312d3fa8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
25 lines
503 B
Plaintext
25 lines
503 B
Plaintext
#
|
|
# qmake configuration for common OS X
|
|
#
|
|
|
|
QMAKE_PLATFORM += macos osx macx
|
|
QMAKE_MAC_SDK = macosx
|
|
|
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
|
|
|
|
# Should be 10.15, but as long as the CI builds with
|
|
# older SDKs we have to keep this.
|
|
QT_MAC_SDK_VERSION_MIN = 10.14
|
|
|
|
QT_MAC_SDK_VERSION_MAX = 11.0
|
|
|
|
device.sdk = macosx
|
|
device.target = device
|
|
device.dir_affix = $${device.sdk}
|
|
device.CONFIG = $${device.sdk}
|
|
device.deployment_identifier = $${device.sdk}
|
|
|
|
QMAKE_LIBS_VULKAN =
|
|
|
|
include(mac.conf)
|