diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-06-24 11:19:08 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-02 11:18:42 +0200 |
| commit | 1cf03765801e3f391323bba3e040a8786017354a (patch) | |
| tree | 54b2d21267d0de1e800c087e4f8e33176f86c59c /src/lib/corelib/language/projectresolver.cpp | |
| parent | e655304fed77ad45cb083a4f62ba308d734025a3 (diff) | |
Correctly handle overriding of file tags via an empty list.
Task-number: QBS-633
Change-Id: I4bf750ff94d6fae38fb3fdb49de265caddcd789e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/corelib/language/projectresolver.cpp')
| -rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index a7bd12a31..bf01fd0d8 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -508,8 +508,11 @@ void ProjectResolver::resolveGroup(Item *item, ProjectContext *projectContext) } group->location = item->location(); group->enabled = isEnabled; - group->fileTags = m_evaluator->fileTagsValue(item, QLatin1String("fileTags")); + bool fileTagsSet; + group->fileTags = m_evaluator->fileTagsValue(item, QLatin1String("fileTags"), &fileTagsSet); group->overrideTags = m_evaluator->boolValue(item, QLatin1String("overrideTags")); + if (group->overrideTags && group->fileTags.isEmpty() && fileTagsSet) + group->fileTags.insert(unknownFileTag()); if (!patterns.isEmpty()) { SourceWildCards::Ptr wildcards = SourceWildCards::create(); |