Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	src/network/access/qhttpthreaddelegate.cpp

Change-Id: Id47b977587e2d713c16ac17e63c5ec80c2f05ee9

1 files changed, 8 insertions, 2 deletions

diff --git a/mkspecs/features/uikit/devices.py b/mkspecs/features/uikit/devices.py
index 0443e838f2..8cdcb370a0 100755
--- a/mkspecs/features/uikit/devices.py
+++ b/mkspecs/features/uikit/devices.py
@@ -46,11 +46,17 @@ import json
 import subprocess
 from distutils.version import StrictVersion
 
+def is_available(object):
+    if "isAvailable" in object:
+        return object["isAvailable"]   # introduced in Xcode 11
+    else:
+        return "unavailable" not in object["availability"]
+
 def is_suitable_runtime(runtimes, runtime_name, platform, min_version):
     for runtime in runtimes:
         identifier = runtime["identifier"]
         if (runtime["name"] == runtime_name or identifier == runtime_name) \
-            and "unavailable" not in runtime["availability"] \
+            and is_available(runtime) \
             and identifier.startswith("com.apple.CoreSimulator.SimRuntime.{}".format(platform)) \
             and StrictVersion(runtime["version"]) >= min_version:
             return True
@@ -77,6 +83,6 @@ if __name__ == "__main__":
     for runtime_name in device_dict:
         if is_suitable_runtime(runtimes, runtime_name, args.platform, args.minimum_deployment_target):
             for device in device_dict[runtime_name]:
-                if "unavailable" not in device["availability"] \
+                if is_available(device) \
                     and (args.state is None or device["state"].lower() in args.state):
                     print(device["udid"])