Commit f0c79725 authored by Christian Kandeler's avatar Christian Kandeler Committed by Joerg Bornemann

Fix compilation with qbs on non-Linux, non-Mac Unix-like systems.

Change-Id: I075585d43f9e36a50c1945b3da4769744faa3f95
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 8eaf5bc6
......@@ -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"
]
......
......@@ -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" }
......
......@@ -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")
......
......@@ -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",
]
......
......@@ -242,7 +242,7 @@ QtcPlugin {
}
Group {
condition: qbs.targetOS == "linux"
condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac"
files: [
"progressmanager/progressmanager_x11.cpp",
]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment