diff options
Diffstat (limited to 'mkspecs/features/uikit')
| -rwxr-xr-x | mkspecs/features/uikit/device_destinations.sh | 2 | ||||
| -rw-r--r-- | mkspecs/features/uikit/sdk.prf | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/features/uikit/device_destinations.sh b/mkspecs/features/uikit/device_destinations.sh index af7cb91e85..b378d67500 100755 --- a/mkspecs/features/uikit/device_destinations.sh +++ b/mkspecs/features/uikit/device_destinations.sh @@ -44,6 +44,8 @@ echo "SIMULATOR_DEVICES = $booted_simulator" xcodebuild test -scheme $2 -destination 'id=0' -destination-timeout 1 2>&1| sed -n 's/{ \(platform:.*\) }/\1/p' | while read destination; do id=$(echo $destination | sed -n -E 's/.*id:([^ ,]+).*/\1/p') + [[ $id == *"placeholder"* ]] && continue + echo $destination | tr ',' '\n' | while read keyval; do key=$(echo $keyval | cut -d ':' -f 1 | tr '[:lower:]' '[:upper:]') val=$(echo $keyval | cut -d ':' -f 2) diff --git a/mkspecs/features/uikit/sdk.prf b/mkspecs/features/uikit/sdk.prf index 94451ea196..0ec065e35d 100644 --- a/mkspecs/features/uikit/sdk.prf +++ b/mkspecs/features/uikit/sdk.prf @@ -12,9 +12,6 @@ build_pass:simulator: \ 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}) |