diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2016-04-25 15:21:01 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2016-04-26 11:33:22 +0000 |
| commit | 8996776f1e494a6858635068e21519dfdc29967d (patch) | |
| tree | 3e60523e41c1f08ffdc0502be2895d2645fe4744 /mkspecs | |
| parent | 172f7e618e9f67bbf178f1fa8b93402a615326f8 (diff) | |
iOS: Handle old exclusive build CONFIG names for simulator and device
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>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/macx-ios-clang/features/resolve_config.prf | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mkspecs/macx-ios-clang/features/resolve_config.prf b/mkspecs/macx-ios-clang/features/resolve_config.prf index 38d6c74ccb..c3ab90f45e 100644 --- a/mkspecs/macx-ios-clang/features/resolve_config.prf +++ b/mkspecs/macx-ios-clang/features/resolve_config.prf @@ -8,6 +8,12 @@ xcodebuild { 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 -= device $${device.CONFIG} else: \ |