From 704b5fa7e8cbe4248be775a40f05c571ad27bec2 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 25 Apr 2018 11:13:24 +0200 Subject: Handle Depends.productTypes entirely in the ModuleLoader The old approach was not compatible with product multiplexing. Change-Id: Iac5947665c41c284fa9e177920fd4f225d353973 Reviewed-by: Joerg Bornemann --- src/lib/corelib/language/projectresolver.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/lib/corelib/language/projectresolver.cpp') diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 174c9d5bd..33fee79b7 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -1322,19 +1322,8 @@ ProjectResolver::ProductDependencyInfos ProjectResolver::getProductDependencies( ProductDependencyInfos result; result.dependencies.reserve(productInfo.usedProducts.size()); for (const auto &dependency : productInfo.usedProducts) { - QBS_CHECK(dependency.name.isEmpty() != dependency.productTypes.empty()); - if (!dependency.productTypes.empty()) { - for (const FileTag &tag : dependency.productTypes) { - const QList productsForTag = m_productsByType.value(tag); - for (const ResolvedProductPtr &p : productsForTag) { - if (p == product || !p->enabled - || (dependency.limitToSubProject && !product->isInParentProject(p))) { - continue; - } - result.dependencies.emplace_back(p, dependency.parameters); - } - } - } else if (dependency.profile == StringConstants::star()) { + QBS_CHECK(!dependency.name.isEmpty()); + if (dependency.profile == StringConstants::star()) { for (const ResolvedProductPtr &p : qAsConst(m_productsByName)) { if (p->name != dependency.name || p == product || !p->enabled || (dependency.limitToSubProject && !product->isInParentProject(p))) { -- cgit v1.2.3