Merge 1.22 into master

Change-Id: I2181ed85563337acab8ec4b563b45511be16f21f

1 files changed, 3 insertions, 3 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)) {