QtQml: Remove QQmlTypeLoader from QQmlImport

The type loader belongs to the engine and we must not store it in
engine-independent data structures. We do want the import cache to be
stored in the type registry, though (in a separate change).

Change-Id: I2828f5098b27bf1fc96852fc2bd160db44b109e7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp
index ced169407a..7283565489 100644
--- a/src/qml/jsruntime/qv4function.cpp
+++ b/src/qml/jsruntime/qv4function.cpp
@@ -136,6 +136,8 @@ Function::Function(ExecutionEngine *engine, ExecutableCompilationUnit *unit,
 
     JSTypedFunction *synthesized = new JSTypedFunction;
 
+    QQmlTypeLoader *typeLoader = engine->typeLoader();
+
     auto findQmlType = [&](const CompiledData::ParameterType &param) {
         const quint32 type = param.typeNameIndexOrCommonType();
         if (param.indexIsCommonType()) {
@@ -146,8 +148,11 @@ Function::Function(ExecutionEngine *engine, ExecutableCompilationUnit *unit,
         if (type == 0)
             return QQmlType();
 
-        const QQmlType qmltype = unit->typeNameCache->query<QQmlImport::AllowRecursion>(
-                                                            unit->stringAt(type)).type;
+        const QQmlType qmltype = typeLoader
+                ? unit->typeNameCache->query<QQmlImport::AllowRecursion>(
+                                             unit->stringAt(type), typeLoader).type
+                : QQmlType();
+
         if (!qmltype.isValid() || qmltype.typeId().isValid())
             return qmltype;