summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2023-05-15 14:23:55 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2023-05-15 18:46:47 +0000
commit8e590b89e6bfea79faaa7637f1b6f82d7c7b71d5 (patch)
treefd16ffbe5bbc3b4124958a22cb24bf9f0ca72309 /src
parentebd9464c98c101842ada9f8ea4e67ca33838bc58 (diff)
downloadqbs-8e590b89e6bfea79faaa7637f1b6f82d7c7b71d5.tar.gz
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 <ABBAPOH@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/corelib/loader/projecttreebuilder.cpp3
1 files changed, 2 insertions, 1 deletions
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(),