diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-02-07 22:45:40 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-02-10 20:22:46 +0000 |
| commit | bf1a4d3c88bd954c4f5dc53639e0a27b7be963f7 (patch) | |
| tree | 4dc76c44d04d2389fdd52b7ef65e6e576bfdd59f /src/qml/jsruntime/qv4engine_p.h | |
| parent | 825da322f7a17d385a2f028443e538a0b68fd0f6 (diff) | |
Don't crash if v8Engine is a nullptr
This at least happens in qmljs.
Change-Id: Ie5617b7ef5790d178c06c7bf2329620d0c185b88
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
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 32e7d9be44..72ade66765 100644 --- a/src/qml/jsruntime/qv4engine_p.h +++ b/src/qml/jsruntime/qv4engine_p.h @@ -153,7 +153,7 @@ public: QQmlEngine *qmlEngine() const; #else // !V4_BOOTSTRAP QJSEngine *jsEngine() const { return publicEngine; } - QQmlEngine *qmlEngine() const { return v8Engine->engine(); } + QQmlEngine *qmlEngine() const { return v8Engine ? v8Engine->engine() : nullptr; } #endif // V4_BOOTSTRAP QV8Engine *v8Engine; QJSEngine *publicEngine; |