diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-07-02 11:28:38 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-07-03 14:50:22 +0200 |
| commit | ad31aa9c9ba64c827a5aace51db716b53dccdafe (patch) | |
| tree | ca07868ebe626d6a33992ba21fe564f2a084c0e9 | |
| parent | 60cac7544407653b16ecffa2a8d1ae6afe45a671 (diff) | |
| download | qbs-ad31aa9c9ba64c827a5aace51db716b53dccdafe.tar.gz | |
Don't let disabled products take part in dependency resolving.
There is no reason that a disabled product's dependencies need to be
satisfied.
Change-Id: Iffdc6fa8a7f463a6de956a89e8071c5612908573
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | src/lib/language/projectresolver.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/language/projectresolver.cpp b/src/lib/language/projectresolver.cpp index 9aeba6f9d..2c67de70b 100644 --- a/src/lib/language/projectresolver.cpp +++ b/src/lib/language/projectresolver.cpp @@ -682,6 +682,8 @@ void ProjectResolver::resolveProductDependencies(ProjectContext *projectContext) do { productDependenciesAdded = false; foreach (const ResolvedProductPtr &rproduct, allProducts) { + if (!rproduct->enabled) + continue; Item *productItem = m_productItemMap.value(rproduct); ModuleLoaderResult::ProductInfo &productInfo = projectContext->loadResult->productInfos[productItem]; @@ -705,6 +707,8 @@ void ProjectResolver::resolveProductDependencies(ProjectContext *projectContext) // Resolve all inter-product dependencies. foreach (const ResolvedProductPtr &rproduct, allProducts) { + if (!rproduct->enabled) + continue; Item *productItem = m_productItemMap.value(rproduct); foreach (const ModuleLoaderResult::ProductInfo::Dependency &dependency, projectContext->loadResult->productInfos.value(productItem).usedProducts) { |