2 files changed, 16 insertions, 4 deletions
diff --git a/share/qbs/modules/bundle/bundle.js b/share/qbs/modules/bundle/bundle.js
index 293f53225..7fb89974a 100644
--- a/share/qbs/modules/bundle/bundle.js
+++ b/share/qbs/modules/bundle/bundle.js
@@ -181,15 +181,15 @@ var XcodeBuildSpecsReader = (function () {
         var i, j;
         for (i = 0; i < specsPaths.length; ++i) {
             var specsPath = specsPaths[i];
-            var names = ["Darwin", "MacOSX"];
+            var names = ["", "Darwin", "MacOSX"];
             for (j = 0; j < names.length; ++j) {
                 var name = names[j];
                 var plist = new PropertyList2();
                 var plist2 = new PropertyList2();
                 try
                 {
-                    var plistName = [name, "Package", "Types.xcspec"].join(separator);
-                    var plistName2 = [name, "Product", "Types.xcspec"].join(separator);
+                    var plistName = [name, "Package", "Types.xcspec"].join(name ? separator : "");
+                    var plistName2 = [name, "Product", "Types.xcspec"].join(name ? separator : "");
                     var plistPath = FileInfo.joinPaths(specsPath, plistName);
                     var plistPath2 = FileInfo.joinPaths(specsPath, plistName2);
                     if (File.exists(plistPath)) {
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"))