Fix wrong usage of Properties blocks in qbs files.

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>

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",

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: [