Merge 2.0 into 2.1

Change-Id: I3a2da652e00ff2adb5e899ce99ad7ed1b8ca37b2

2 files changed, 3 insertions, 2 deletions

diff --git a/share/qbs/modules/xcode/xcode.js b/share/qbs/modules/xcode/xcode.js
index 6bd37ad10..a931273f2 100644
--- a/share/qbs/modules/xcode/xcode.js
+++ b/share/qbs/modules/xcode/xcode.js
@@ -112,7 +112,7 @@ function sdkInfoList(sdksPath) {
         if (!sdks[i].match(/[0-9]+/))
             continue;
 
-        if (sdks[i].startsWith("DriverKit"))
+        if (sdks[i].startsWith("DriverKit") || sdks[i].startsWith("AssetRuntime"))
             continue;
 
         var settingsPlist = FileInfo.joinPaths(sdksPath, sdks[i], "SDKSettings.plist");
diff --git a/share/qbs/modules/xcode/xcode.qbs b/share/qbs/modules/xcode/xcode.qbs
index 941b8d395..c052da44c 100644
--- a/share/qbs/modules/xcode/xcode.qbs
+++ b/share/qbs/modules/xcode/xcode.qbs
@@ -134,6 +134,7 @@ Module {
 
     readonly property var _sdkSettings: {
         if (_availableSdks) {
+            // see 'sdk' property doc to understand why this loop is needed
             for (var i in _availableSdks) {
                 if (_availableSdks[i]["Version"] === sdk)
                     return _availableSdks[i];
@@ -141,7 +142,7 @@ Module {
                     return _availableSdks[i];
             }
 
-            // Latest SDK available for the platform
+            // Latest SDK available for the platform (default case)
             if (DarwinTools.applePlatformName(qbs.targetOS, platformType) === sdk)
                 return _latestSdk;
         }