Commit 94ceccd0 authored by Christian Kandeler's avatar Christian Kandeler

Utils: Fix qbs build.

Qt 5.6 no longer pulls in the pthread library.

Change-Id: I8b266cf89e9e05aaff3d7cd5ea36707e49e8ccdb
Reviewed-by: default avatarChristian Stenger <christian.stenger@theqtcompany.com>
parent dcfb6221
......@@ -9,20 +9,19 @@ QtcLibrary {
"QTC_REL_TOOLS_PATH=\"" + FileInfo.relativePath(project.ide_bin_path,
project.ide_libexec_path) + "\""
])
Properties {
condition: qbs.targetOS.contains("windows")
cpp.dynamicLibraries: [
"user32",
"iphlpapi",
"ws2_32",
"shell32",
]
}
Properties {
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
cpp.dynamicLibraries: ["X11"]
cpp.dynamicLibraries: {
var libs = [];
if (qbs.targetOS.contains("windows")) {
libs.push("user32", "iphlpapi", "ws2_32", "shell32");
} else if (qbs.targetOS.contains("unix")) {
if (!qbs.targetOS.contains("osx"))
libs.push("X11");
if (!qbs.targetOS.contains("openbsd"))
libs.push("pthread");
}
return libs;
}
Properties {
condition: qbs.targetOS.contains("osx")
cpp.frameworks: ["Foundation"]
......
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