1 files changed, 7 insertions, 12 deletions
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs
index 306e7cb07..e9f9128e2 100644
--- a/share/qbs/modules/bundle/BundleModule.qbs
+++ b/share/qbs/modules/bundle/BundleModule.qbs
@@ -84,7 +84,10 @@ Module {
                                                           specsSeparator,
                                                           additionalSettings,
                                                           !qbs.targetOS.contains("macos"));
-            var settings = reader.expandedSettings(_productTypeIdentifier);
+            var settings = reader.expandedSettings(_productTypeIdentifier,
+                                                   xcode.present
+                                                   ? xcode._architectureSettings
+                                                   : {});
             var chain = reader.productTypeIdentifierChain(_productTypeIdentifier);
             if (settings && chain) {
                 xcodeSettings = settings;
@@ -98,7 +101,8 @@ Module {
         }
     }
 
-    additionalProductTypes: ["bundle.content"]
+    additionalProductTypes: !(product.multiplexed || product.aggregate)
+                            || !product.multiplexConfigurationId ? ["bundle.content"] : []
 
     property bool isBundle: !product.consoleApplication && qbs.targetOS.contains("darwin")
 
@@ -289,10 +293,6 @@ Module {
             cmd.qmakeEnv = ModUtils.moduleProperty(product, "qmakeEnv");
 
             cmd.buildEnv = product.moduleProperty("cpp", "buildEnv");
-            cmd.defines = product.moduleProperty("cpp", "defines");
-            cmd.platformDefines = product.moduleProperty("cpp", "platformDefines");
-            cmd.compilerDefines = product.moduleProperty("cpp", "compilerDefines");
-            cmd.allDefines = [].concat(cmd.defines || []).concat(cmd.platformDefines || []).concat(cmd.compilerDefines || []);
 
             cmd.developerPath = product.moduleProperty("xcode", "developerPath");
             cmd.platformInfoPlist = product.moduleProperty("xcode", "platformInfoPlist");
@@ -395,11 +395,6 @@ Module {
                     for (key in qmakeEnv)
                         env[key] = qmakeEnv[key];
 
-                    for (i = 0; i < allDefines.length; ++i) {
-                        var parts = allDefines[i].split('=');
-                        env[parts[0]] = parts[1];
-                    }
-
                     DarwinTools.expandPlistEnvironmentVariables(aggregatePlist, env, true);
 
                     // Add keys from partial Info.plists from asset catalogs, XIBs, and storyboards
@@ -652,7 +647,7 @@ Module {
 
             var executables = outputs["bundle.symlink.executable"];
             for (i in executables) {
-                cmd = new Command("ln", ["-sf", FileInfo.joinPaths("Versions", "Current", product.targetName),
+                cmd = new Command("ln", ["-sfn", FileInfo.joinPaths("Versions", "Current", product.targetName),
                                          executables[i].filePath]);
                 cmd.silent = true;
                 commands.push(cmd);