From e5e685145e0fb3b69675fcda148d3335e8661fd5 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 19 Nov 2013 10:35:28 +0100 Subject: Fix group prefix bug. e32f9bf66f023669a748046fae9c6d030deef9a0 was incomplete. Change-Id: Ie7c26658c1b44b8a66bd199e4ef3d88f3ea598f2 Reviewed-by: Jake Petroules Reviewed-by: Christian Kandeler --- src/lib/language/projectresolver.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/language/projectresolver.cpp b/src/lib/language/projectresolver.cpp index fa9f5ad94..65a874d70 100644 --- a/src/lib/language/projectresolver.cpp +++ b/src/lib/language/projectresolver.cpp @@ -449,16 +449,15 @@ void ProjectResolver::resolveGroup(Item *item, ProjectContext *projectContext) item->location()); } QStringList patterns; - QString prefix; for (int i = files.count(); --i >= 0;) { if (FileInfo::isPattern(files[i])) patterns.append(files.takeAt(i)); } GroupPtr group = ResolvedGroup::create(); group->prefix = m_evaluator->stringValue(item, QLatin1String("prefix")); - if (!prefix.isEmpty()) { + if (!group->prefix.isEmpty()) { for (int i = files.count(); --i >= 0;) - files[i].prepend(prefix); + files[i].prepend(group->prefix); } group->location = item->location(); group->enabled = isEnabled; @@ -468,7 +467,7 @@ void ProjectResolver::resolveGroup(Item *item, ProjectContext *projectContext) if (!patterns.isEmpty()) { SourceWildCards::Ptr wildcards = SourceWildCards::create(); wildcards->excludePatterns = m_evaluator->stringListValue(item, "excludeFiles"); - wildcards->prefix = prefix; + wildcards->prefix = group->prefix; wildcards->patterns = patterns; QSet files = wildcards->expandPatterns(group, m_productContext->product->sourceDirectory); foreach (const QString &fileName, files) -- cgit v1.2.1