From 4492084b6e0c6b277326131cf917325ec5173e3a Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 17 Feb 2015 11:38:02 +0100 Subject: Don't evaluate module properties twice for groups with fileTagsFilter. Change-Id: Ib7c1f1b6b35a0ca7d5794da72cc1de3d5068eac2 Reviewed-by: Joerg Bornemann --- src/lib/corelib/language/projectresolver.cpp | 4 +--- 1 file changed, 1 insertion(+), 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())); -- cgit v1.2.3