diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-04-14 17:19:33 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-04-15 15:23:26 +0200 |
| commit | 93a6b4a600721cecae1ebca0fbb7b9d8ab4d79de (patch) | |
| tree | e76d4f716b7321b4dd466ac3386615acbc6f843d | |
| parent | e109f76ce8010021b0c4171565c2d3b1de6e5f57 (diff) | |
fix collecting defines in moc.js
We cannot call the moduleProperties function to retrieve
cpp.platformDefines and cpp.compilerDefines because it
combines all found values of this property. We're only
interested in the values that are set in the product's
instance of the cpp module.
Task-number: QBS-539
Change-Id: I2edbbf44b2cbc3051a0f0abec42d5d385fbb106e
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | src/lib/qtprofilesetup/templates/moc.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/qtprofilesetup/templates/moc.js b/src/lib/qtprofilesetup/templates/moc.js index 29f70fdb4..f22aca90f 100644 --- a/src/lib/qtprofilesetup/templates/moc.js +++ b/src/lib/qtprofilesetup/templates/moc.js @@ -28,9 +28,8 @@ ****************************************************************************/ function args(product, input, outputFileName) { - var defines = ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'compilerDefines'); - defines = defines.uniqueConcat( - ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'platformDefines')); + var defines = product.moduleProperty("cpp", "compilerDefines"); + defines = defines.uniqueConcat(product.moduleProperty("cpp", "platformDefines")); defines = defines.uniqueConcat( ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'defines')); var includePaths = ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'includePaths'); |