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

Fix wrong usage of Properties blocks in qbs files.

Browse Source 
A property set on the product level is ignored if the same property
is also set in a Properties block whose condition matches.

Change-Id: I9248d735977e3d8ff8f1836fd80a49f3c8839bdc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2013-03-15 11:57:00 +01:00
committed by Joerg Bornemann
parent 6d8e352981
commit d646bde5f4
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libs/zeroconf/zeroconf.qbs
View File

@@ -8,21 +8,24 @@ QtcLibrary {
Depends { name: "Qt.network" } Depends { name: "Qt.network" }
cpp.includePaths: base.concat(".") cpp.includePaths: base.concat(".")
cpp.defines: base.concat("ZEROCONF_LIBRARY") cpp.defines: {
var list = base;
Properties { list.push("ZEROCONF_LIBRARY");
condition: qbs.targetOS == "windows" if (qbs.targetOS === "linux") {
cpp.dynamicLibraries: "ws2_32" list.push(
}
Properties {
condition: qbs.targetOS == "linux"
cpp.defines: base.concat([
"_GNU_SOURCE", "_GNU_SOURCE",
"HAVE_IPV6", "HAVE_IPV6",
"USES_NETLINK", "USES_NETLINK",
"HAVE_LINUX", "HAVE_LINUX",
"TARGET_OS_LINUX" "TARGET_OS_LINUX"
]) );
}
return list;
}
Properties {
condition: qbs.targetOS == "windows"
cpp.dynamicLibraries: "ws2_32"
} }
files: [ files: [

12
src/plugins/help/help.qbs
View File

@@ -21,11 +21,15 @@ QtcPlugin {
Depends { name: "app_version_header" } Depends { name: "app_version_header" }
Depends { name: "cpp" } Depends { name: "cpp" }
Properties {
condition: qtcore.versionMajor >= 5 cpp.defines: {
cpp.defines: base.concat(["QT_NO_WEBKIT"]) var list = base;
if (qtcore.versionMajor >= 5)
list.push("QT_NO_WEBKIT");
list.push("QT_CLUCENE_SUPPORT");
return list;
} }
cpp.defines: base.concat("QT_CLUCENE_SUPPORT")
cpp.includePaths: base.concat("../../shared/help") cpp.includePaths: base.concat("../../shared/help")
files: [ files: [