ModuleLoader: Remove unneed loadBaseModule() call

That call was probably conceptually unneeded since d08ce8f643 (because
from then on the module instance, which already has a qbs instance, was
used to evaluate the condition), and harmful since be8432fac9 (because
the loadBaseModule() call then happened on the shared module prototype).
This patch also needs to touch the module merger: Because the prototype
is now not tainted with qbs properties from the product item anymore, we
have to make sure that variant values are not ignored during module
merging; otherwise, qbs properties set by the multiplexing
procedure could get lost in the merge process.

Change-Id: Iae5d47dbe018d330f4c96e919bb0f83c086ae1df
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 0 insertions, 5 deletions

diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 36bde088f..879acff3d 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -3091,11 +3091,6 @@ Item *ModuleLoader::loadModuleFile(ProductContext *productContext, const QString
     // Set the name before evaluating any properties. EvaluatorScriptClass reads the module name.
     module->setProperty(StringConstants::nameProperty(), VariantValue::create(fullModuleName));
 
-    if (!isBaseModule) {
-        // We need the base module for the Module.condition check below.
-        loadBaseModule(productContext, module);
-    }
-
     Item *deepestModuleInstance = findDeepestModuleInstance(moduleInstance);
     Item *origDeepestModuleInstancePrototype = deepestModuleInstance->prototype();
     deepestModuleInstance->setPrototype(module);