diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-04-04 15:44:53 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-04-04 16:06:37 +0200 |
| commit | 036a4435e1daf93e70fcb8b25951515886862651 (patch) | |
| tree | 6a67546a6cb37f53cb7a142edbea16b399d0b9c8 | |
| parent | 1285e6546517b2f47ccd79241e26771b6db07a4b (diff) | |
avoid duplicate defines in moc call
Change-Id: If0494d2e2bd1f4bc6deff9491bca1a1e84665b41
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | src/lib/qtprofilesetup/templates/moc.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/qtprofilesetup/templates/moc.js b/src/lib/qtprofilesetup/templates/moc.js index d81bb456f..55b719363 100644 --- a/src/lib/qtprofilesetup/templates/moc.js +++ b/src/lib/qtprofilesetup/templates/moc.js @@ -29,8 +29,10 @@ function args(product, input, outputFileName) { var defines = ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'compilerDefines'); - defines = defines.concat(ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'platformDefines')); - defines = defines.concat(ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'defines')); + defines = defines.uniqueConcat( + ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'platformDefines')); + defines = defines.uniqueConcat( + ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'defines')); var includePaths = ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'includePaths'); var args = []; args = args.concat( |