summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-09-09 13:02:38 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-09-22 00:01:30 +0200
commitad4faa25a524da8291525ca0afe2f2a65bf6b456 (patch)
tree0093a41d341bad4deff2c5a7ccdc52cbffa85400 /mkspecs/features
parenta320b54bb670c3a9cbb44346ab092076f20ef82a (diff)
qmake: Print error when iOS simulator device could not be found
A qmake project built for iOS-simulator tries to find suitable devices in xcodebuild.mk. If no suitable device could be found, the build failed with xcodebuild: error: missing value for key 'id' of option 'Destination' which isn't that helpful. Detect the situation in xcodebuild.mk and print an error message. Pick-to: 5.15 6.2 Fixes: QTBUG-77222 Change-Id: I02f9ab0dd7b8f234bcd8d0ea387927f31ca092e0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/uikit/xcodebuild.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/features/uikit/xcodebuild.mk b/mkspecs/features/uikit/xcodebuild.mk
index 84e82477ea..8b98cdfc60 100644
--- a/mkspecs/features/uikit/xcodebuild.mk
+++ b/mkspecs/features/uikit/xcodebuild.mk
@@ -72,7 +72,11 @@ endif
%-device: DEVICES = $(HARDWARE_DEVICES)
GENERIC_DEVICE_DESTINATION := $(EXPORT_GENERIC_DEVICE_DESTINATION)
-GENERIC_SIMULATOR_DESTINATION := "id=$(shell $(MAKEFILE_DIR)devices.py $(EXPORT_DEVICE_FILTER) | tail -n 1)"
+GENERIC_SIMULATOR_DESTINATION := $(shell $(MAKEFILE_DIR)devices.py $(EXPORT_DEVICE_FILTER) | tail -n 1)
+ifeq ($(GENERIC_SIMULATOR_DESTINATION),)
+ $(error Could not find any device matching '$(EXPORT_DEVICE_FILTER)'.)
+endif
+GENERIC_SIMULATOR_DESTINATION := "id=$(GENERIC_SIMULATOR_DESTINATION)"
%-simulator: DESTINATION = $(if $(DESTINATION_ID),"id=$(DESTINATION_ID)",$(GENERIC_SIMULATOR_DESTINATION))
%-device: DESTINATION = $(if $(DESTINATION_ID),"id=$(DESTINATION_ID)",$(GENERIC_DEVICE_DESTINATION))