aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-10-18 11:26:03 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-10-18 13:45:05 +0200
commit690b4c2674066ade3c8e82e5a48bb102e19b2a8c (patch)
tree5d2fdbcac050ca9356181447b36aaf8369fa066f
parenta1fa96a91a388712dac8bda34811b382509ece1b (diff)
call Module.validate after the base module setup
Special base module properties like hostOS were not available in Module.validate. Change-Id: I14f506dea2eb10edc726dd5a789e04e97f06f9a5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r--src/lib/language/moduleloader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/language/moduleloader.cpp b/src/lib/language/moduleloader.cpp
index cb525c985..7bbf76f12 100644
--- a/src/lib/language/moduleloader.cpp
+++ b/src/lib/language/moduleloader.cpp
@@ -625,6 +625,7 @@ Item *ModuleLoader::loadModule(ProductContext *productContext, Item *item,
if (!cacheHit && isBaseModule)
setupBaseModulePrototype(modulePrototype);
instantiateModule(productContext, item, moduleInstance, modulePrototype, moduleName);
+ callValidateScript(moduleInstance);
return moduleInstance;
}
@@ -774,7 +775,6 @@ Item *ModuleLoader::loadModuleFile(ProductContext *productContext, const QString
QStringList(fullModuleName), vmit.key())));
}
- callValidateScript(module);
productContext->moduleItemCache.insert(filePath, module);
productContext->project->moduleItemCache.insert(filePath, module);
return module;