From 4d11bd859ff1ee4491d7eafaaf8563c3c3d46c91 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 16 May 2014 16:50:32 +0200 Subject: 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 --- src/lib/corelib/language/projectresolver.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/lib/corelib/language') 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; -- cgit v1.2.3