ef25620ac1
Conflicts: mkspecs/features/mac/default_pre.prf mkspecs/features/qpa/genericunixfontdatabase.prf mkspecs/features/uikit/default_post.prf mkspecs/features/uikit/resolve_config.prf mkspecs/macx-ios-clang/features/default_post.prf mkspecs/macx-ios-clang/features/resolve_config.prf src/corelib/io/qiodevice.cpp Change-Id: I6f210f71f177a3c3278a4f380542195e14e4b491
18 lines
565 B
Plaintext
18 lines
565 B
Plaintext
|
|
xcodebuild {
|
|
# Xcode project files always support both Debug and Release configurations
|
|
# and device and simulator targets, so we make sure the wrapper-makefile
|
|
# also does.
|
|
CONFIG += debug_and_release simulator_and_device
|
|
}
|
|
|
|
load(resolve_config)
|
|
|
|
!macx-xcode:xcodebuild {
|
|
# Switch the order to make sure that the first Makefile target is the right one
|
|
!qtConfig(simulator_and_device):contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \
|
|
addExclusiveBuilds(simulator, device)
|
|
else: \
|
|
addExclusiveBuilds(device, simulator)
|
|
}
|