From d2bc4a4330254c0c68a0ade51b59a71c4b67b470 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Tue, 3 Jun 2025 14:35:29 +0200
Subject: QtQml: Hold QQmlTypeLoader in QV4::ExecutionEngine

... rather than QQmlEngine. This paves the way for having the type
loader attached to ExecutionEngine rather than QQmlEngine.

Also, reference the execution engine in the type loader, in turn.

Task-number: QTBUG-19407
Change-Id: I04e571c5c6ac5bce5e82537cb96c6940c7186f3a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/qml/jsruntime/qv4engine.cpp | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'src/qml/jsruntime/qv4engine.cpp')

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 82e653a645..1f27ca1f1e 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -856,6 +856,10 @@ ExecutionEngine::ExecutionEngine(QJSEngine *jsEngine)
 
 ExecutionEngine::~ExecutionEngine()
 {
+#if QT_CONFIG(qml_network)
+    delete networkAccessManager;
+#endif
+    m_typeLoader.reset();
     qDeleteAll(m_extensionData);
     delete m_multiplyWrappedQObjects;
     m_multiplyWrappedQObjects = nullptr;
@@ -884,6 +888,15 @@ ExecutionEngine::~ExecutionEngine()
 #endif
 }
 
+#if QT_CONFIG(qml_network)
+QNetworkAccessManager *ExecutionEngine::getNetworkAccessManager()
+{
+    if (!networkAccessManager)
+        networkAccessManager = typeLoader()->createNetworkAccessManager(nullptr);
+    return networkAccessManager;
+}
+#endif
+
 #if QT_CONFIG(qml_debug)
 void ExecutionEngine::setDebugger(Debugging::Debugger *debugger)
 {
@@ -2194,13 +2207,10 @@ ExecutionEngine::Module ExecutionEngine::registerNativeModule(
         return Module();
 
     QQmlRefPointer<CompiledData::CompilationUnit> cu;
-    if (m_qmlEngine) {
-        // Make sure the type loader doesn't try to resolve the module anymore.
-        // If some other code requests that same module, we need to produce the same CU.
-        cu = QQmlEnginePrivate::get(m_qmlEngine)->typeLoader.injectModule(url, unit);
-    } else {
-        cu = QQml::makeRefPointer<CompiledData::CompilationUnit>(unit);
-    }
+
+    // Make sure the type loader doesn't try to resolve the module anymore.
+    // If some other code requests that same module, we need to produce the same CU.
+    cu = typeLoader()->injectModule(url, unit);
 
     QQmlRefPointer<ExecutableCompilationUnit> newModule = insertCompilationUnit(std::move(cu));
 
@@ -2956,11 +2966,4 @@ int ExecutionEngine::registerExtension()
     return registrationData()->extensionCount++;
 }
 
-#if QT_CONFIG(qml_network)
-QNetworkAccessManager *QV4::detail::getNetworkAccessManager(ExecutionEngine *engine)
-{
-    return engine->qmlEngine()->networkAccessManager();
-}
-#endif // qml_network
-
 QT_END_NAMESPACE
-- 
cgit v1.2.3