do not collect cpp.platformDefines from dependent modules

cpp.platformDefines is dependent on properties that are set in the
product's or a group's instance of cpp. Therefore we must not combine
the values of this property from the input and its dependencies.

Task-number: QBS-433
Change-Id: Id90ffc9d8193d8425e62ffc3d0b1d3cca83f8dff
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

3 files changed, 6 insertions, 6 deletions

diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index ce0cf5b8d..453b2b31e 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -167,7 +167,7 @@ function additionalCompilerFlags(product, input, output)
     var cppFlags = ModUtils.moduleProperties(input, 'cppFlags');
     for (i in cppFlags)
         args.push('-Wp,' + cppFlags[i])
-    var platformDefines = ModUtils.moduleProperties(input, 'platformDefines');
+    var platformDefines = ModUtils.moduleProperty(input, 'platformDefines');
     for (i in platformDefines)
         args.push('-D' + platformDefines[i]);
     var defines = ModUtils.moduleProperties(input, 'defines');
diff --git a/share/qbs/modules/cpp/windows-mingw.qbs b/share/qbs/modules/cpp/windows-mingw.qbs
index 024f887ab..2cb80ca6b 100644
--- a/share/qbs/modules/cpp/windows-mingw.qbs
+++ b/share/qbs/modules/cpp/windows-mingw.qbs
@@ -45,7 +45,7 @@ GenericGCC {
         }
 
         prepare: {
-            var platformDefines = ModUtils.moduleProperties(input, 'platformDefines');
+            var platformDefines = ModUtils.moduleProperty(input, 'platformDefines');
             var defines = ModUtils.moduleProperties(input, 'defines');
             var includePaths = ModUtils.moduleProperties(input, 'includePaths');
             var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index 419a6f922..079795558 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -85,7 +85,7 @@ CppModule {
             fileName: ".obj/" + product.name + "/" + product.name + '_c.pch'
         }
         prepare: {
-            var platformDefines = ModUtils.moduleProperties(input, 'platformDefines');
+            var platformDefines = ModUtils.moduleProperty(input, 'platformDefines');
             var defines = ModUtils.moduleProperties(input, 'defines');
             var includePaths = ModUtils.moduleProperties(input, 'includePaths');
             var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
@@ -112,7 +112,7 @@ CppModule {
             fileName: ".obj/" + product.name + "/" + product.name + '_cpp.pch'
         }
         prepare: {
-            var platformDefines = ModUtils.moduleProperties(input, 'platformDefines');
+            var platformDefines = ModUtils.moduleProperty(input, 'platformDefines');
             var defines = ModUtils.moduleProperties(input, 'defines');
             var includePaths = ModUtils.moduleProperties(input, 'includePaths');
             var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
@@ -134,7 +134,7 @@ CppModule {
         }
 
         prepare: {
-            var platformDefines = ModUtils.moduleProperties(input, 'platformDefines');
+            var platformDefines = ModUtils.moduleProperty(input, 'platformDefines');
             var defines = ModUtils.moduleProperties(input, 'defines');
             var includePaths = ModUtils.moduleProperties(input, 'includePaths');
             var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
@@ -245,7 +245,7 @@ CppModule {
         }
 
         prepare: {
-            var platformDefines = ModUtils.moduleProperties(input, 'platformDefines');
+            var platformDefines = ModUtils.moduleProperty(input, 'platformDefines');
             var defines = ModUtils.moduleProperties(input, 'defines');
             var includePaths = ModUtils.moduleProperties(input, 'includePaths');
             var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');