From 7a9a778604a03473b6c4ef8a481ba3cc06d48265 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 5 Jan 2024 14:08:32 +0100 Subject: 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 --- src/qml/qml/qqmlengine.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/qml/qml/qqmlengine.cpp') diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index d2a4aaf5a7..a5f6d4d531 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -2134,9 +2134,8 @@ LoadHelper::ResolveTypeResult LoadHelper::resolveType(QAnyStringView typeName) QTypeRevision versionReturn; QList errors; QQmlImportNamespace *ns_return = nullptr; - m_importCache->resolveType(typeName.toString(), &type, &versionReturn, - &ns_return, - &errors); + m_importCache->resolveType( + typeLoader(), typeName.toString(), &type, &versionReturn, &ns_return, &errors); return {ResolveTypeResult::ModuleFound, type}; } -- cgit v1.2.3