aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/language/moduleloader.h
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2018-04-18 14:26:13 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2018-04-19 05:27:07 +0000
commite6c7198a70502c40516c8708510c2031eeb12180 (patch)
treea5524e4ac557b82cd32eda9aee32867e3381843d /src/lib/corelib/language/moduleloader.h
parent5378c7d4dd7ef920841b01bca3cb75585e7ee5f2 (diff)
Fix evaluation of qbs.profile in products
For the evaluation of qbs.profile we need a properly loaded qbs module in prepareProduct. Re-use the code we already had in multiplexProductItem. Change-Id: Id3757edd70758f3739d5aaa52e7839ed7fdd8b00 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/language/moduleloader.h')
-rw-r--r--src/lib/corelib/language/moduleloader.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h
index 5d7f20db4..7c090237b 100644
--- a/src/lib/corelib/language/moduleloader.h
+++ b/src/lib/corelib/language/moduleloader.h
@@ -291,6 +291,8 @@ private:
bool isBaseModule, const QString &filePath, bool *triedToLoad, Item *moduleInstance);
Item::Module loadBaseModule(ProductContext *productContext, Item *item);
void setupBaseModulePrototype(Item *prototype);
+ template <typename T, typename F>
+ T callWithTemporaryBaseModule(ProductContext *productContext, const F &func);
void instantiateModule(ProductContext *productContext, Item *exportingProductItem,
Item *instanceScope, Item *moduleInstance, Item *modulePrototype,
const QualifiedId &moduleName, ProductModuleInfo *productModuleInfo);