AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iOS: Handle old exclusive build CONFIG names for simulator and device

Browse Source 
Qt Creator uses e.g. CONFIG+=iphoneos to make the default build target
be device. Now that the exclusive build is named simulator_and_device
to support e.g. tvOS, we need to handle the old CONFIG names for
backwards compatibility.

Task-number: QTBUG-52970
Change-Id: I0f864bebf11e657eb4225a182753037205f450b8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Tor Arne Vestbø 2016-04-25 15:21:01 +02:00
parent 172f7e618e
commit 8996776f1e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mkspecs/macx-ios-clang/features/resolve_config.prf
View File

@ -8,6 +8,12 @@ xcodebuild {
load(resolve_config) load(resolve_config)
# Legacy exclusive build configurations for backwards compatibility
CONFIG($${device.CONFIG}, $${device.CONFIG}|$${simulator.CONFIG}): \
CONFIG += device
else: CONFIG($${simulator.CONFIG}, $${device.CONFIG}|$${simulator.CONFIG}): \
CONFIG += simulator
CONFIG(simulator, simulator|device): \ CONFIG(simulator, simulator|device): \
CONFIG -= device $${device.CONFIG} CONFIG -= device $${device.CONFIG}
else: \ else: \