From 8e590b89e6bfea79faaa7637f1b6f82d7c7b71d5 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 15 May 2023 14:23:55 +0200 Subject: Loader: Do not collect shadow products by type These should never be matched by Depends.productTypes. This amends fb52fed84a1510a7de0172e643d6fd66a780e2e8. The problem was that Depends.productTypes now considers Module.additionalProductTypes, which may come in via exported dependencies from the main product, which the shadow product has a dependency on. Change-Id: I73080949b3cb80642e28851517b58fd6a70affca Reviewed-by: Ivan Komissarov --- src/lib/corelib/loader/projecttreebuilder.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/corelib/loader/projecttreebuilder.cpp b/src/lib/corelib/loader/projecttreebuilder.cpp index a13c3c2e7..a5d224a16 100644 --- a/src/lib/corelib/loader/projecttreebuilder.cpp +++ b/src/lib/corelib/loader/projecttreebuilder.cpp @@ -890,7 +890,8 @@ void ProjectTreeBuilder::Private::handleProduct(ProductContext &product, Deferra disabledItems.unite(groupsHandler.disabledGroups()); // Collect the full list of fileTags, including the values contributed by modules. - if (!product.info.delayedError.hasError() && enabled) { + if (!product.info.delayedError.hasError() && enabled + && !product.name.startsWith(StringConstants::shadowProductPrefix())) { for (const FileTag &tag : fileTags) productsByType.insert({tag, &product}); product.item->setProperty(StringConstants::typeProperty(), -- cgit v1.2.1