511790fd1a
Conflicts: config_help.txt configure mkspecs/features/uikit/sdk.prf src/corelib/global/qhooks.cpp src/corelib/io/qfilesystemwatcher.cpp src/corelib/io/qlockfile_unix.cpp src/corelib/tools/qalgorithms.h src/gui/kernel/qwindowsysteminterface.h src/gui/text/qtextdocument_p.cpp src/network/access/access.pri src/network/access/qnetworkaccessmanager.cpp src/network/access/qnetworkreplynsurlconnectionimpl.mm src/src.pro src/testlib/qtestcase.cpp src/widgets/kernel/qwidgetbackingstore_p.h src/widgets/styles/qwindowscestyle.cpp src/widgets/styles/qwindowsmobilestyle.cpp tests/auto/corelib/io/qdiriterator/qdiriterator.pro tests/auto/corelib/io/qfileinfo/qfileinfo.pro tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp tools/configure/configureapp.cpp Change-Id: Ibf7fb9c8cf263a810ade82f821345d0725c57c67
33 lines
1.4 KiB
Plaintext
33 lines
1.4 KiB
Plaintext
|
|
# In case the user sets the SDK manually
|
|
contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*) {
|
|
contains(QT_CONFIG, simulator_and_device): \
|
|
error("Simulator is handled automatically for simulator_and_device")
|
|
|
|
CONFIG += simulator $${simulator.sdk}
|
|
}
|
|
|
|
build_pass:simulator: \
|
|
QMAKE_MAC_SDK ~= s,^$${device.sdk},$${simulator.sdk},
|
|
|
|
load(sdk)
|
|
|
|
lessThan(QMAKE_MAC_SDK_VERSION, "8.0"): \
|
|
error("Current $$QMAKE_MAC_SDK SDK version ($$QMAKE_MAC_SDK_VERSION) is too old. Please upgrade Xcode.")
|
|
|
|
macx-xcode {
|
|
sdk_path_device.name = "QMAKE_MAC_SDK_PATH[sdk=$${device.sdk}*]"
|
|
sdk_path_device.value = $$xcodeSDKInfo(Path, $${device.sdk})
|
|
sdk_path_simulator.name = "QMAKE_MAC_SDK_PATH[sdk=$${simulator.sdk}*]"
|
|
sdk_path_simulator.value = $$xcodeSDKInfo(Path, $${simulator.sdk})
|
|
QMAKE_MAC_XCODE_SETTINGS += sdk_path_device sdk_path_simulator
|
|
QMAKE_MAC_SDK_PATH = "$(QMAKE_MAC_SDK_PATH)"
|
|
|
|
sdk_platform_path_device.name = "QMAKE_MAC_SDK_PLATFORM_PATH[sdk=$${device.sdk}*]"
|
|
sdk_platform_path_device.value = $$xcodeSDKInfo(PlatformPath, $${device.sdk})
|
|
sdk_platform_path_simulator.name = "QMAKE_MAC_SDK_PLATFORM_PATH[sdk=$${simulator.sdk}*]"
|
|
sdk_platform_path_simulator.value = $$xcodeSDKInfo(PlatformPath, $${simulator.sdk})
|
|
QMAKE_MAC_XCODE_SETTINGS += sdk_platform_path_device sdk_platform_path_simulator
|
|
QMAKE_MAC_SDK_PLATFORM_PATH = "$(QMAKE_MAC_SDK_PLATFORM_PATH)"
|
|
}
|