diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-25 11:13:24 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-02 09:21:18 +0000 |
| commit | 704b5fa7e8cbe4248be775a40f05c571ad27bec2 (patch) | |
| tree | 856e7c9087144c785d81b99168340b3416f848c7 /src/lib/corelib/language/projectresolver.cpp | |
| parent | 89c3e4e08f915578d7260dc2d8ec4747442c7100 (diff) | |
Handle Depends.productTypes entirely in the ModuleLoader
The old approach was not compatible with product multiplexing.
Change-Id: Iac5947665c41c284fa9e177920fd4f225d353973
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/language/projectresolver.cpp')
| -rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
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<ResolvedProductPtr> 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))) { |