diff options
author | Liang Qi <liang.qi@qt.io> | 2016-12-14 08:15:56 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-12-14 08:39:44 +0000 |
commit | ed32558d6280cae40578f735fd326327d571d993 (patch) | |
tree | 5df4aa2904aef12346dde45160dd50591182539a /src/qml/jsruntime/qv4engine_p.h | |
parent | 7aaebe557476c088d339f1b4b114a671885c4ea8 (diff) | |
parent | 172260ebef6b830768468317deee5e05743f92f3 (diff) |
Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/dev
Diffstat (limited to 'src/qml/jsruntime/qv4engine_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4engine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h index a46066bde4..25d6fc1970 100644 --- a/src/qml/jsruntime/qv4engine_p.h +++ b/src/qml/jsruntime/qv4engine_p.h @@ -147,7 +147,7 @@ public: QQmlEngine *qmlEngine() const; #else // !V4_BOOTSTRAP QJSEngine *jsEngine() const { return v8Engine->publicEngine(); } - QQmlEngine *qmlEngine() const { return v8Engine->engine(); } + QQmlEngine *qmlEngine() const { return v8Engine ? v8Engine->engine() : nullptr; } #endif // V4_BOOTSTRAP QV8Engine *v8Engine; |