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

update qbs files

Browse Source 
Use the new contains function and the targetOS list.

Change-Id: I38b995eb9328e449befad85792512c45670cc8c9
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Joerg Bornemann
2013-06-20 14:43:33 +02:00
parent 84a597e411
commit cd37aef6cf
19 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ QtcLibrary {
cpp.defines: base.concat("QTCREATOR_UTILS_LIB")
Properties {
condition: qbs.targetOS == "windows"
condition: qbs.targetOS.contains("windows")
cpp.dynamicLibraries: [
"user32",
"iphlpapi",
@@ -15,7 +15,7 @@ QtcLibrary {
]
}
Properties {
condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac"
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("mac")
cpp.dynamicLibraries: ["X11"]
}
@@ -197,7 +197,7 @@ QtcLibrary {
Group {
name: "WindowsUtils"
condition: qbs.targetOS == "windows"
condition: qbs.targetOS.contains("windows")
files: [
"consoleprocess_win.cpp",
"winutils.cpp",
@@ -207,7 +207,7 @@ QtcLibrary {
Group {
name: "ConsoleProcess_unix"
condition: qbs.targetPlatform.indexOf("unix") != -1
condition: qbs.targetOS.contains("unix")
files: [
"consoleprocess_unix.cpp",
]