diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2020-08-04 13:06:40 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-08-04 14:20:31 +0000 |
commit | 1e713049134f1826c69ac14a97c9a602c24f3399 (patch) | |
tree | a56cbc901a0826134cb114f15387febc5cc3ed76 | |
parent | 373c733308e6ced2def3f4ac91b91d270c2eb5df (diff) | |
download | qbs-1e713049134f1826c69ac14a97c9a602c24f3399.tar.gz |
ModuleLoader: Fix scope for RHS of module provider property bindings
The scope should be the product item itself.
Fixes: QBS-1587
Change-Id: Iccdc89e3b57d6ee1f11205961cf6244ea560f425
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 2 | ||||
-rw-r--r-- | tests/auto/blackbox/testdata/module-providers/module-providers.qbs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 09bfb00e8..1c331c60d 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -3844,7 +3844,7 @@ QVariantMap ModuleLoader::moduleProviderConfig(ModuleLoader::ProductContext &pro product.theModuleProviderConfig.insert(name.toString(), m); } }; - configItemValue->item()->setScope(product.scope); + configItemValue->item()->setScope(product.item); collectMap(configItemValue->item(), QualifiedId()); } for (auto it = product.moduleProperties.begin(); it != product.moduleProperties.end(); ++it) { diff --git a/tests/auto/blackbox/testdata/module-providers/module-providers.qbs b/tests/auto/blackbox/testdata/module-providers/module-providers.qbs index 1ffa49038..0322cc0e0 100644 --- a/tests/auto/blackbox/testdata/module-providers/module-providers.qbs +++ b/tests/auto/blackbox/testdata/module-providers/module-providers.qbs @@ -12,7 +12,7 @@ Project { Depends { name: "mygenerator.module2" } Depends { name: "othergenerator" } moduleProviders.mygenerator.chooseLettersFrom: project.beginning - moduleProviders.othergenerator.someDefines: "app1" + moduleProviders.othergenerator.someDefines: name files: "main.cpp" } CppApplication { |