diff --git a/src/libs/zeroconf/zeroconf.qbs b/src/libs/zeroconf/zeroconf.qbs index 04274fd6f69d600922d8d71e1ac6de9b948c9aa2..51ca09d0f1ebae07ec34f54f8a2b6d56d53b446c 100644 --- a/src/libs/zeroconf/zeroconf.qbs +++ b/src/libs/zeroconf/zeroconf.qbs @@ -8,22 +8,25 @@ QtcLibrary { Depends { name: "Qt.network" } cpp.includePaths: base.concat(".") - cpp.defines: base.concat("ZEROCONF_LIBRARY") + cpp.defines: { + var list = base; + list.push("ZEROCONF_LIBRARY"); + if (qbs.targetOS === "linux") { + list.push( + "_GNU_SOURCE", + "HAVE_IPV6", + "USES_NETLINK", + "HAVE_LINUX", + "TARGET_OS_LINUX" + ); + } + return list; + } Properties { condition: qbs.targetOS == "windows" cpp.dynamicLibraries: "ws2_32" } - Properties { - condition: qbs.targetOS == "linux" - cpp.defines: base.concat([ - "_GNU_SOURCE", - "HAVE_IPV6", - "USES_NETLINK", - "HAVE_LINUX", - "TARGET_OS_LINUX" - ]) - } files: [ "avahiLib.cpp", diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs index 75152239c4a93312f5661f6403f065f50c514780..90c215d1ec598f60409c8ce02dab17c9cf18eb77 100644 --- a/src/plugins/help/help.qbs +++ b/src/plugins/help/help.qbs @@ -21,11 +21,15 @@ QtcPlugin { Depends { name: "app_version_header" } Depends { name: "cpp" } - Properties { - condition: qtcore.versionMajor >= 5 - cpp.defines: base.concat(["QT_NO_WEBKIT"]) + + cpp.defines: { + 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") files: [