diff options
| author | Mike Krus <mike.krus@kdab.com> | 2016-03-05 16:55:50 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2016-04-27 05:37:52 +0000 |
| commit | f05d5dfa85a5863dbcab42e8d5e06eda8754a73d (patch) | |
| tree | 2e74d2fa5f0c440a2fda36355842f3f6291d2a72 | |
| parent | c10a1c8f14c519024cdc6f0ee3fae64263979635 (diff) | |
Rename iOS device and simulator targets
Use non-os specific target names in Makefiles (device as opposed to
iphoneos, simulator as opposed to iphonesimulator)
Change-Id: Ic8441c09a0e9a254e43f31b678025f16e9a1c440
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| -rw-r--r-- | mkspecs/common/ios.conf | 4 | ||||
| -rw-r--r-- | mkspecs/macx-ios-clang/xcodebuild.mk | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mkspecs/common/ios.conf b/mkspecs/common/ios.conf index f8f810d4f0..a40ab48ac5 100644 --- a/mkspecs/common/ios.conf +++ b/mkspecs/common/ios.conf @@ -6,13 +6,13 @@ QMAKE_PLATFORM += ios QMAKE_MAC_SDK = iphoneos simulator.sdk = iphonesimulator -simulator.target = $${simulator.sdk} +simulator.target = simulator simulator.dir_affix = $${simulator.sdk} simulator.CONFIG = $${simulator.sdk} simulator.deployment_identifier = ios-simulator device.sdk = iphoneos -device.target = $${device.sdk} +device.target = device device.dir_affix = $${device.sdk} device.CONFIG = $${device.sdk} device.deployment_identifier = $${device.sdk} diff --git a/mkspecs/macx-ios-clang/xcodebuild.mk b/mkspecs/macx-ios-clang/xcodebuild.mk index 1bd18430df..4ff9c5a9c1 100644 --- a/mkspecs/macx-ios-clang/xcodebuild.mk +++ b/mkspecs/macx-ios-clang/xcodebuild.mk @@ -40,17 +40,17 @@ $(EXPORT_SUBTARGETS): % : %-build %-install: ACTION = install %-install: xcodebuild-% ; -# iOS Simulator doesn't support archiving -%-iphonesimulator-install: ACTION = build -iphonesimulator-install: ACTION = build +# Simulator doesn't support archiving +%-simulator-install: ACTION = build +simulator-install: ACTION = build # Limit check to a single configuration -%-iphoneos-check: check-iphoneos ; -%-iphonesimulator-check: check-iphonesimulator ; +%-device-check: check-device ; +%-simulator-check: check-simulator ; # SDK -%-iphoneos: SDK = iphoneos -%-iphonesimulator: SDK = iphonesimulator +%-device: SDK = iphoneos +%-simulator: SDK = iphonesimulator # Configuration release-%: CONFIGURATION = Release @@ -67,8 +67,8 @@ ifneq ($(filter check%,$(MAKECMDGOALS)),) endif endif -%-iphonesimulator: DEVICES = $(firstword $(IPHONESIMULATOR_DEVICES)) -%-iphoneos: DEVICES = $(IPHONEOS_DEVICES) +%-simulator: DEVICES = $(firstword $(IPHONESIMULATOR_DEVICES)) +%-device: DEVICES = $(IPHONEOS_DEVICES) IPHONEOS_GENERIC_DESTINATION := "generic/platform=iOS" IPHONESIMULATOR_GENERIC_DESTINATION := "id=$(shell xcrun simctl list devices | grep -E 'iPhone|iPad' | grep -v unavailable | perl -lne 'print $$1 if /\((.*?)\)/' | tail -n 1)" |