diff options
Diffstat (limited to 'src/lib/corelib/language/moduleloader.cpp')
-rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 2f109256c..07f293691 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -1192,14 +1192,13 @@ void ModuleLoader::adjustDependenciesForMultiplexing(const ProductContext &produ multiplexId); return; - } else { - // Otherwise collect partial matches and decide later - const auto dependencyMultiplexConfig = - MultiplexInfo::multiplexIdToVariantMap(dependency->multiplexConfigurationId); - - if (multiplexConfigurationIntersects(dependencyMultiplexConfig, productMultiplexConfig)) - multiplexIds << dependency->multiplexConfigurationId; } + // Otherwise collect partial matches and decide later + const auto dependencyMultiplexConfig = MultiplexInfo::multiplexIdToVariantMap( + dependency->multiplexConfigurationId); + + if (multiplexConfigurationIntersects(dependencyMultiplexConfig, productMultiplexConfig)) + multiplexIds << dependency->multiplexConfigurationId; } else { // (2b), (3b) or (3c) const bool profileMatch = !profilesPropertyIsSet || profiles.empty() @@ -3838,7 +3837,8 @@ void ModuleLoader::addProductModuleDependencies(ProductContext *productContext, multiplexConfigIdProp)->value().toString(); depsToAdd.push_back(dep); break; - } else if (profileMatch) { + } + if (profileMatch) { dep.multiplexConfigurationId = dependencies.at(i)->multiplexConfigurationId; depsToAdd.push_back(dep); } |