diff options
| -rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/api/tst_api.cpp | 1 |
2 files changed, 3 insertions, 1 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; diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index 988bc1b9d..ab52b7040 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -425,7 +425,6 @@ void TestApi::fileTagsFilterOverride() QList<qbs::InstallableFile> installableFiles = project.installableFilesForProduct(product, qbs::InstallOptions()); QCOMPARE(installableFiles.count(), 1); - QEXPECT_FAIL(0, "QBS-424", Continue); QVERIFY(installableFiles.first().targetDirectory().contains("habicht")); } |