Merge 1.9 into master

Change-Id: I6da76b0a53bf87105c4e7b48724d9760cb68e831

4 files changed, 16 insertions, 14 deletions

diff --git a/share/qbs/modules/cli/CLIModule.qbs b/share/qbs/modules/cli/CLIModule.qbs
index 3b4ce8693..5c708a482 100644
--- a/share/qbs/modules/cli/CLIModule.qbs
+++ b/share/qbs/modules/cli/CLIModule.qbs
@@ -5,9 +5,11 @@ import qbs.ModUtils
 import "cli.js" as CLI
 
 Module {
-    Depends { name: "bundle" }
-
-    bundle.isBundle: false
+    Depends { name: "bundle"; condition: qbs.targetOS.contains("darwin") }
+    Properties {
+        condition: qbs.targetOS.contains("darwin")
+        bundle.isBundle: false
+    }
 
     condition: false
 
diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs
index 317d9d782..ec36f960d 100644
--- a/share/qbs/modules/cpp/DarwinGCC.qbs
+++ b/share/qbs/modules/cpp/DarwinGCC.qbs
@@ -181,14 +181,14 @@ UnixGCC {
 
         // Set the corresponding environment variable even if the minimum OS version is undefined,
         // because this indicates the default deployment target for that OS
-        if (qbs.targetOS.contains("ios"))
-            env["IPHONEOS_DEPLOYMENT_TARGET"] = minimumIosVersion || "";
-        if (qbs.targetOS.contains("macos"))
-            env["MACOSX_DEPLOYMENT_TARGET"] = minimumMacosVersion || "";
-        if (qbs.targetOS.contains("watchos"))
-            env["WATCHOS_DEPLOYMENT_TARGET"] = minimumWatchosVersion || "";
-        if (qbs.targetOS.contains("tvos"))
-            env["TVOS_DEPLOYMENT_TARGET"] = minimumTvosVersion || "";
+        if (qbs.targetOS.contains("ios") && minimumIosVersion)
+            env["IPHONEOS_DEPLOYMENT_TARGET"] = minimumIosVersion;
+        if (qbs.targetOS.contains("macos") && minimumMacosVersion)
+            env["MACOSX_DEPLOYMENT_TARGET"] = minimumMacosVersion;
+        if (qbs.targetOS.contains("watchos") && minimumWatchosVersion)
+            env["WATCHOS_DEPLOYMENT_TARGET"] = minimumWatchosVersion;
+        if (qbs.targetOS.contains("tvos") && minimumTvosVersion)
+            env["TVOS_DEPLOYMENT_TARGET"] = minimumTvosVersion;
 
         if (xcode.present)
             env["TARGETED_DEVICE_FAMILY"] = DarwinTools.targetedDeviceFamily(xcode.targetDevices);
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 722ac7438..638882aa7 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -46,7 +46,7 @@ CppModule {
     Probes.BinaryProbe {
         id: compilerPathProbe
         condition: !toolchainInstallPath
-        names: [compilerName]
+        names: [toolchainPrefix ? toolchainPrefix + compilerName : compilerName]
     }
 
     // Find the version as early as possible in case other things depend on it,
diff --git a/share/qbs/modules/cpp/windows-mingw.qbs b/share/qbs/modules/cpp/windows-mingw.qbs
index 1b19bb06b..fec31cf3f 100644
--- a/share/qbs/modules/cpp/windows-mingw.qbs
+++ b/share/qbs/modules/cpp/windows-mingw.qbs
@@ -53,13 +53,13 @@ GenericGCC {
     property path windresPath: { return toolchainPathPrefix + windresName }
 
     setupBuildEnvironment: {
-        var v = new ModUtils.EnvironmentVariable("PATH", ";", true);
+        var v = new ModUtils.EnvironmentVariable("PATH", qbs.pathListSeparator, true);
         v.prepend(toolchainInstallPath);
         v.set();
     }
 
     setupRunEnvironment: {
-        var v = new ModUtils.EnvironmentVariable("PATH", ";", true);
+        var v = new ModUtils.EnvironmentVariable("PATH", qbs.pathListSeparator, true);
         v.prepend(toolchainInstallPath);
         v.set();
     }