diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2025-06-03 14:35:29 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2025-06-17 07:00:33 +0200 |
| commit | d2bc4a4330254c0c68a0ade51b59a71c4b67b470 (patch) | |
| tree | 8345312f50df0be783618fd75a1d7e52c2ca65d7 /src/qml/jsapi | |
| parent | 8e0810c19c791386fd5f2cefc6b992f45be21750 (diff) | |
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>
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsengine_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/jsapi/qjsengine_p.h b/src/qml/jsapi/qjsengine_p.h index 0ab893d02a..c1f7895549 100644 --- a/src/qml/jsapi/qjsengine_p.h +++ b/src/qml/jsapi/qjsengine_p.h @@ -35,9 +35,11 @@ class Q_QML_EXPORT QJSEnginePrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QJSEngine) public: - static QJSEnginePrivate* get(QJSEngine*e) { return e->d_func(); } + static QJSEnginePrivate *get(QJSEngine*e) { return e->d_func(); } static const QJSEnginePrivate* get(const QJSEngine*e) { return e->d_func(); } - static QJSEnginePrivate* get(QV4::ExecutionEngine *e); + static QJSEngine *get(QJSEnginePrivate *e) { return e->q_func(); } + static const QJSEngine *get(const QJSEnginePrivate *e) { return e->q_func(); } + static QJSEnginePrivate *get(QV4::ExecutionEngine *e); QJSEnginePrivate() = default; ~QJSEnginePrivate() override; |