diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-12-19 17:14:15 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-02-07 16:32:48 +0000 |
| commit | 8419ff45d4f99e585119fa77a1066d4ddaee827c (patch) | |
| tree | 8598cf1b33e46041c5fb41908e5de2fb9689b2b5 /src/qml/jsruntime/qv4engine_p.h | |
| parent | aa9027a1d8617b31969643c89fe92a34dbd93325 (diff) | |
Further simplify relation between different engines
The only engine we ever ask for QJSEngine is QV4::ExecutionEngine.
Change-Id: Ia1354e552bddac72177b7aa62de5a7a502089841
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4engine_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4engine_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h index c048f5f68d..bb832050cd 100644 --- a/src/qml/jsruntime/qv4engine_p.h +++ b/src/qml/jsruntime/qv4engine_p.h @@ -153,10 +153,11 @@ public: QJSEngine *jsEngine() const; QQmlEngine *qmlEngine() const; #else // !V4_BOOTSTRAP - QJSEngine *jsEngine() const { return v8Engine->publicEngine(); } - QQmlEngine *qmlEngine() const { return v8Engine ? v8Engine->engine() : nullptr; } + QJSEngine *jsEngine() const { return publicEngine; } + QQmlEngine *qmlEngine() const { return v8Engine->engine(); } #endif // V4_BOOTSTRAP QV8Engine *v8Engine; + QJSEngine *publicEngine; enum JSObjects { RootContext, @@ -371,7 +372,7 @@ public: int internalClassIdCount = 0; - ExecutionEngine(); + ExecutionEngine(QJSEngine *jsEngine = nullptr); ~ExecutionEngine(); #if !QT_CONFIG(qml_debug) |