diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-07-02 21:53:03 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-07-27 11:13:39 +0000 |
| commit | 04ed920ff19a3c7d4fdda0212aee0b057fc6be6b (patch) | |
| tree | 78b91cdce9e58924b9c083d9e76f57b8d92e08e2 | |
| parent | ae1368529849bcad0d7d524ae9396c4205209322 (diff) | |
| download | qbs-04ed920ff19a3c7d4fdda0212aee0b057fc6be6b.tar.gz | |
Use the fallback mode from parameters
... when looking for transitive deps
It makes sense to use the same logic for both scoped and fallback
providers when looking for transitive deps. In any case, providers
should have been run during normal dependency search and we should not
execute any new providers here.
Change-Id: I2053fe84adab327b8ab5fcb414ce53d7cf83bdb7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 3d059b4a8..fd9a3e070 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -3937,9 +3937,11 @@ void ModuleLoader::addTransitiveDependencies(ProductContext *ctx) if (module.isProduct) { ctx->item->addModule(module); } else { + const FallbackMode fallbackMode = m_parameters.fallbackProviderEnabled() + ? FallbackMode::Enabled : FallbackMode::Disabled; Item::Module dep; dep.item = loadModule(ctx, nullptr, ctx->item, ctx->item->location(), QString(), - module.name, QString(), FallbackMode::Disabled, + module.name, QString(), fallbackMode, module.required, &dep.isProduct, &dep.parameters); if (!dep.item) { throw ErrorInfo(Tr::tr("Module '%1' not found when setting up transitive " |