diff options
| -rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/disabledProduct/disabledProduct.qbs | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 4eb9cf01c..d16f2469d 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -404,8 +404,7 @@ void ModuleLoader::handleProduct(ProjectContext *projectContext, Item *item) dependsContext.productDependencies = &productContext.info.usedProducts; setScopeForDescendants(item, productContext.scope); resolveDependencies(&dependsContext, item); - if (!checkItemCondition(item)) - return; + checkItemCondition(item); createAdditionalModuleInstancesInProduct(&productContext); foreach (Item *child, item->children()) { diff --git a/tests/auto/blackbox/testdata/disabledProduct/disabledProduct.qbs b/tests/auto/blackbox/testdata/disabledProduct/disabledProduct.qbs index 0c44995c7..c57615c10 100644 --- a/tests/auto/blackbox/testdata/disabledProduct/disabledProduct.qbs +++ b/tests/auto/blackbox/testdata/disabledProduct/disabledProduct.qbs @@ -3,4 +3,8 @@ import qbs CppApplication { condition: false files: "main.cpp" + Group { + condition: qbs.targetOS.contains("stuff") + qbs.install: false + } } |