qbs build: A number of missing adaptations to qbs changes.

Change-Id: I37452bad6a51bb8d40a13232d46c575a483c5a6c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

7 files changed, 13 insertions, 20 deletions

diff --git a/share/share.qbs b/share/share.qbs
index 6b29c3bb18..8808efb39b 100644
--- a/share/share.qbs
+++ b/share/share.qbs
@@ -37,18 +37,13 @@ Product {
                 "qmlviewer.xml",
                 "sort.xml",
             ]
-            switch (qbs.targetOS) {
-            case "windows":
+            if (qbs.targetOS.contains("windows"))
                 list.push("notepad_win.xml");
-                break;
-            case "mac":
+            else if (qbs.targetOS.contains("osx"))
                 list.push("vi_mac.xml");
-                break;
-            default:
+            else
                 list.push("vi.xml");
-            }
             return list;
         }
     }
 }
-
diff --git a/src/app/app.qbs b/src/app/app.qbs
index 824999c116..c995ed5042 100644
--- a/src/app/app.qbs
+++ b/src/app/app.qbs
@@ -9,7 +9,7 @@ Application {
                                              : ["$ORIGIN/../lib/qtcreator"]
     cpp.defines: Defaults.defines(qbs)
     cpp.linkerFlags: {
-        if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
+        if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw")))
             return ["-Wl,-s"]
     }
     cpp.includePaths: [
diff --git a/src/app/app_version_header.qbs b/src/app/app_version_header.qbs
index 4dfc1f5b37..ddefebb83e 100644
--- a/src/app/app_version_header.qbs
+++ b/src/app/app_version_header.qbs
@@ -24,7 +24,7 @@ Product {
             cmd.ide_version_major = product.ide_version_major;
             cmd.ide_version_minor = product.ide_version_minor;
             cmd.ide_version_release = product.ide_version_release;
-            cmd.onWindows = (product.moduleProperty("qbs", "targetOS") === "windows");
+            cmd.onWindows = (product.moduleProperty("qbs", "targetOS").contains("windows"));
             cmd.sourceCode = function() {
                 var file = new TextFile(input.fileName);
                 var content = file.readAll();
diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs
index 35d2b20666..7c6be844c8 100644
--- a/src/libs/QtcLibrary.qbs
+++ b/src/libs/QtcLibrary.qbs
@@ -10,7 +10,7 @@ DynamicLibrary {
 
     cpp.defines: Defaults.defines(qbs)
     cpp.linkerFlags: {
-        if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
+        if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw")))
             return ["-Wl,-s"]
     }
     cpp.installNamePrefix: "@rpath/PlugIns/"
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index 924e8918d7..1f60a5726a 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -70,9 +70,9 @@ QtcLibrary {
             result.push("USE_SYSTEM_BOTAN")
         else {
             result.push("BOTAN_DLL=")
-            if (qbs.toolchain === "msvc")
+            if (qbs.toolchain.contains("msvc"))
                 result.push("BOTAN_BUILD_COMPILER_IS_MSVC", "BOTAN_TARGET_OS_HAS_GMTIME_S")
-            if (qbs.toolchain === "gcc" || qbs.toolchain === "mingw")
+            if (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw"))
                 result.push("BOTAN_BUILD_COMPILER_IS_GCC")
             if (qbs.targetOS.contains("linux"))
                 result.push("BOTAN_TARGET_OS_IS_LINUX", "BOTAN_TARGET_OS_HAS_CLOCK_GETTIME",
@@ -105,7 +105,7 @@ QtcLibrary {
 
     // For Botan.
     Properties {
-        condition: qbs.toolchain === "mingw"
+        condition: qbs.toolchain.contains("mingw")
         cpp.cxxFlags: [
             "-fpermissive",
             "-finline-functions",
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index 6af280cb2d..a6ff01c0a2 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -10,12 +10,10 @@ Product {
     targetName: {
         // see PluginSpecPrivate::loadLibrary()
         if (qbs.debugInformation) {
-            switch (qbs.targetOS) {
-            case "windows":
+            if (qbs.targetOS.contains("windows"))
                 return name + "d";
-            case "mac":
+            if (qbs.targetOS.contains("osx"))
                 return name + "_debug";
-            }
         }
         return name;
     }
@@ -33,7 +31,7 @@ Product {
     cpp.rpaths: qbs.targetOS.contains("osx") ? ["@loader_path/../..", "@executable_path/.."]
                                       : ["$ORIGIN", "$ORIGIN/..", "$ORIGIN/../.."]
     cpp.linkerFlags: {
-        if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
+        if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw")))
             return ["-Wl,-s"]
     }
     cpp.includePaths: [ ".", ".." ]
diff --git a/src/tools/QtcTool.qbs b/src/tools/QtcTool.qbs
index 781eaee5a0..4b2a4b26ef 100644
--- a/src/tools/QtcTool.qbs
+++ b/src/tools/QtcTool.qbs
@@ -6,7 +6,7 @@ Application {
     Depends { name: "cpp" }
     cpp.defines: Defaults.defines(qbs)
     cpp.linkerFlags: {
-        if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
+        if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw")))
             return ["-Wl,-s"]
     }