aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2015-02-17 11:38:02 +0100
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2015-02-17 12:20:47 +0000
commit4492084b6e0c6b277326131cf917325ec5173e3a (patch)
treef4b2ffb829412bd16f19182c3474344b759bf4e7
parent59c61da6ec4027c0a52a57a6357f58a07f2e1a96 (diff)
Don't evaluate module properties twice for groups with fileTagsFilter.1.3
Change-Id: Ib7c1f1b6b35a0ca7d5794da72cc1de3d5068eac2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-rw-r--r--src/lib/corelib/language/projectresolver.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index 83d661c14..15204b094 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -510,9 +510,7 @@ void ProjectResolver::resolveGroup(Item *item, ProjectContext *projectContext)
return;
ArtifactPropertiesPtr aprops = ArtifactProperties::create();
aprops->setFileTagsFilter(FileTags::fromStringList(fileTagsFilter));
- PropertyMapPtr cfg = PropertyMapInternal::create();
- cfg->setValue(evaluateModuleValues(item));
- aprops->setPropertyMapInternal(cfg);
+ aprops->setPropertyMapInternal(moduleProperties);
m_productContext->product->artifactProperties += aprops;
m_productContext->artifactPropertiesPerFilter.insert(fileTagsFilter,
ProductContext::ArtifactPropertiesInfo(aprops, item->location()));