forked from qt-creator/qt-creator
update qbs files
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:
@@ -25,13 +25,13 @@ QtcPlugin {
|
||||
])
|
||||
|
||||
cpp.dynamicLibraries: {
|
||||
if (qbs.targetOS == "windows") return [
|
||||
if (qbs.targetOS.contains("windows")) return [
|
||||
"ole32",
|
||||
"user32"
|
||||
]
|
||||
}
|
||||
|
||||
cpp.frameworks: qbs.targetOS === "mac" ? ["AppKit"] : undefined
|
||||
cpp.frameworks: qbs.targetOS.contains("mac") ? ["AppKit"] : undefined
|
||||
|
||||
files: [
|
||||
"basefilewizard.cpp",
|
||||
@@ -233,7 +233,7 @@ QtcPlugin {
|
||||
|
||||
Group {
|
||||
name: "ProgressManager_win"
|
||||
condition: qbs.targetOS == "windows"
|
||||
condition: qbs.targetOS.contains("windows")
|
||||
files: [
|
||||
"progressmanager/progressmanager_win.cpp",
|
||||
]
|
||||
@@ -241,7 +241,7 @@ QtcPlugin {
|
||||
|
||||
Group {
|
||||
name: "ProgressManager_mac"
|
||||
condition: qbs.targetOS == "mac"
|
||||
condition: qbs.targetOS.contains("mac")
|
||||
files: [
|
||||
"macfullscreen.h",
|
||||
"macfullscreen.mm",
|
||||
@@ -251,7 +251,7 @@ QtcPlugin {
|
||||
|
||||
Group {
|
||||
name: "ProgressManager_x11"
|
||||
condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac"
|
||||
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("mac")
|
||||
files: [
|
||||
"progressmanager/progressmanager_x11.cpp",
|
||||
]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import qbs.base 1.0
|
||||
|
||||
Product {
|
||||
condition: qbs.targetOS == "linux"
|
||||
condition: qbs.targetOS.contains("linux")
|
||||
name: "LogoImages"
|
||||
|
||||
Group {
|
||||
|
||||
Reference in New Issue
Block a user