From f0c797256ee0144b74f1a1f264abe3392500d2db Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Fri, 8 Feb 2013 17:18:15 +0100
Subject: [PATCH] Fix compilation with qbs on non-Linux, non-Mac Unix-like
 systems.

Change-Id: I075585d43f9e36a50c1945b3da4769744faa3f95
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 qtcreator.qbs                         |  4 ++--
 src/libs/QtcLibrary.qbs               |  2 +-
 src/libs/ssh/ssh.qbs                  | 12 +++++++++++-
 src/libs/utils/utils.qbs              |  4 ++--
 src/plugins/coreplugin/coreplugin.qbs |  2 +-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/qtcreator.qbs b/qtcreator.qbs
index 3283c3d8065..4cd1eb85098 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -174,14 +174,14 @@ Project {
         ]
 
         Group {
-            condition: qbs.targetOS == "linux" || qbs.targetOS == "macx"
+            condition: qbs.targetPlatform.indexOf("unix") != -1
             files: "bin/qtcreator.sh"
             qbs.install: true
             qbs.installDir: "bin"
         }
 
         Group {
-           condition: qbs.targetOS == "linux" || qbs.targetOS == "macx"
+           condition: qbs.targetPlatform.indexOf("unix") != -1
            files: [
                "src/shared/qtlockedfile/qtlockedfile_unix.cpp"
            ]
diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs
index ce553a06f95..3672957743b 100644
--- a/src/libs/QtcLibrary.qbs
+++ b/src/libs/QtcLibrary.qbs
@@ -13,7 +13,7 @@ DynamicLibrary {
         if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
             return ["-Wl,-s"]
     }
-    cpp.includePaths: [ "." ]
+    cpp.includePaths: [ ".", ".." ]
 
     ProductModule {
         Depends { name: "cpp" }
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index e6b1b9ba6dc..18624d7d954 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -45,7 +45,17 @@ QtcLibrary {
     ].concat(botanFiles)
 
     property var botanIncludes: ["../3rdparty"]
-    property var botanLibs: qbs.targetOS === "windows" ? ["advapi32", "user32"] : ["rt", "dl"]
+    property var botanLibs: {
+        var result = [];
+        if (qbs.targetOS === "windows")
+            result.push("advapi32", "user32")
+        else {
+            result.push("rt")
+            if (qbs.targetOS === "linux" || qbs.targetOS === "mac")
+                result.push("dl")
+        }
+        return result
+    }
     property var botanDefines: {
             var result = ['BOTAN_DLL=']
             if (qbs.toolchain === "msvc")
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 9a1a6d897bc..208f8c16703 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -15,7 +15,7 @@ QtcLibrary {
         ]
     }
     Properties {
-        condition: qbs.targetOS == "linux"
+        condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac"
         cpp.dynamicLibraries: ["X11"]
     }
 
@@ -205,7 +205,7 @@ QtcLibrary {
     }
 
     Group {
-        condition: qbs.targetOS == "linux" || qbs.targetOS == "mac"
+        condition: qbs.targetPlatform.indexOf("unix") != -1
         files: [
             "consoleprocess_unix.cpp",
         ]
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index b8250e8cfb1..2e9d871469a 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -242,7 +242,7 @@ QtcPlugin {
     }
 
     Group {
-        condition: qbs.targetOS == "linux"
+        condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac"
         files: [
             "progressmanager/progressmanager_x11.cpp",
         ]