Merge 1.22 into master

Change-Id: I2181ed85563337acab8ec4b563b45511be16f21f

1 files changed, 13 insertions, 1 deletions

diff --git a/share/qbs/modules/xcode/xcode.js b/share/qbs/modules/xcode/xcode.js
index 1060894d4..c6c77ca73 100644
--- a/share/qbs/modules/xcode/xcode.js
+++ b/share/qbs/modules/xcode/xcode.js
@@ -202,7 +202,19 @@ function boolFromSdkOrPlatform(varName, sdkProps, platformProps, defaultValue) {
     return defaultValue;
 }
 
-function archsSpecsPath(version, targetOS, platformType, platformPath, devicePlatformPath) {
+function archsSpecsPath(version, targetOS, platformType, platformPath, devicePlatformPath,
+                        developerPath) {
+    if (Utilities.versionCompare(version, "13.3") >= 0) {
+        var baseDir = FileInfo.joinPaths(developerPath, "..",
+                                         "PlugIns/XCBSpecifications.ideplugin/Contents/Resources");
+        var baseName = targetOS.contains("macos") ? "MacOSX Architectures"
+                : targetOS.contains("ios-simulator") ? "iOS Simulator"
+                : targetOS.contains("ios") ? "iOS Device"
+                : targetOS.contains("tvos-simulator") ? "tvOS Simulator"
+                : targetOS.contains("tvos") ? "tvOS Device"
+                : targetOS.contains("watchos-simulator") ? "watchOS Simulator" : "watchOS Device";
+        return FileInfo.joinPaths(baseDir, baseName + ".xcspec");
+    }
     var _specsPluginBaseName;
     if (Utilities.versionCompare(version, "12") >= 0) {
         if (targetOS.contains("macos"))