aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/language/moduleloader.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-08-06 11:48:28 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-08-08 11:05:28 +0000
commit1e9c7c948c8c8b896434484d047d12efc93a2342 (patch)
tree3250877de9849c56646d66140beffd2394afc6ae /src/lib/corelib/language/moduleloader.cpp
parent66131652f178cd1605b8a2c0ba7023392e13ad5a (diff)
ModuleLoader: Fix edge case in Depends.productTypes
It makes no sense to consider multiplexed variants of the same product. Change-Id: I7ebee091264451dc587156a0c543932059ed9948 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/language/moduleloader.cpp')
-rw-r--r--src/lib/corelib/language/moduleloader.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index ac6d756b8..4b87809c4 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -982,6 +982,7 @@ void ModuleLoader::normalizeDependencies(ProductContext *product,
const auto range = m_productsByType.equal_range(typeTag);
for (auto it = range.first; it != range.second; ++it) {
if (it->second != product
+ && (!product || it->second->name != product->name)
&& (!limitToSubProject || hasSameSubProject(*product, *it->second))) {
matchingProducts.push_back(it->second);
}