diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-16 16:50:32 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-05-19 17:44:57 +0200 |
commit | 4d11bd859ff1ee4491d7eafaaf8563c3c3d46c91 (patch) | |
tree | 184fa1fcc0abaf6c8926118382ed1d4ddf0adda2 /src/lib/corelib/language | |
parent | 07f06ca9826a8e53ba25b9b210536cc8f548f654 (diff) |
fix inheritance for Groups with the same fileTagsFilter
Discard any Group with the same fileTagsFilter that was defined in
a base file.
Task-number: QBS-424
Change-Id: I51f0c317f36ae953cc3e777ed4e5426c9b6ddc9d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/language')
-rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 8b58912ed..4fe03b7cb 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -467,6 +467,9 @@ void ProjectResolver::resolveGroup(Item *item, ProjectContext *projectContext) error.append(Tr::tr("Second item"), item->location()); throw error; } + + // Discard any Group with the same fileTagsFilter that was defined in a base file. + m_productContext->product->artifactProperties.removeAll(apinfo.first); } if (!isEnabled) return; |