diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-11-19 10:35:28 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-11-19 17:43:36 +0100 |
| commit | e5e685145e0fb3b69675fcda148d3335e8661fd5 (patch) | |
| tree | a9d884cdeb97ac3e31566dcb282c5853c61d8fcb /src/lib | |
| parent | c485150efa863fd4a244b7a223ec90734dbe6e04 (diff) | |
| download | qbs-e5e685145e0fb3b69675fcda148d3335e8661fd5.tar.gz | |
Fix group prefix bug.
e32f9bf66f023669a748046fae9c6d030deef9a0 was incomplete.
Change-Id: Ie7c26658c1b44b8a66bd199e4ef3d88f3ea598f2
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/language/projectresolver.cpp | 7 |
1 files 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<QString> files = wildcards->expandPatterns(group, m_productContext->product->sourceDirectory); foreach (const QString &fileName, files) |
