feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix qbs build.

Browse Source 
Qt 5.6 no longer pulls in the pthread library.

Change-Id: I8b266cf89e9e05aaff3d7cd5ea36707e49e8ccdb
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Christian Kandeler
2016-02-02 15:13:40 +01:00
parent dcfb622126
commit 94ceccd0eb
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libs/utils/utils.qbs
View File

@@ -9,20 +9,19 @@ QtcLibrary {
"QTC_REL_TOOLS_PATH=\"" + FileInfo.relativePath(project.ide_bin_path, "QTC_REL_TOOLS_PATH=\"" + FileInfo.relativePath(project.ide_bin_path,
project.ide_libexec_path) + "\"" project.ide_libexec_path) + "\""
]) ])
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("windows")
cpp.dynamicLibraries: [
"user32",
"iphlpapi",
"ws2_32",
"shell32",
]
}
Properties {
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
cpp.dynamicLibraries: ["X11"]
}
Properties { Properties {
condition: qbs.targetOS.contains("osx") condition: qbs.targetOS.contains("osx")
cpp.frameworks: ["Foundation"] cpp.frameworks: ["Foundation"]