diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-18 01:00:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-18 01:00:06 +0200 |
| commit | f0f01cc37910a6b1ca454a4374138d76cd09901a (patch) | |
| tree | 1b112993e5b84f58541c7216d1fcc738271f0ab3 /src/qml/jsruntime/qv4runtime.cpp | |
| parent | 7c3dad14d38aea0239e5e66c9018acdc0e6c0b55 (diff) | |
| parent | 6069cc1cd1a6309cdffeb8bdd9c4035f33742228 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I4a9c7802c180757e70fa4dd16df3287104a088bc
Diffstat (limited to 'src/qml/jsruntime/qv4runtime.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index 46d7353eda..c984a70a14 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -1271,7 +1271,9 @@ QV4::ReturnedValue Runtime::method_createUnmappedArgumentsObject(ExecutionEngine ReturnedValue Runtime::method_loadQmlContext(NoThrowEngine *engine) { - return engine->qmlContext()->asReturnedValue(); + Heap::QmlContext *ctx = engine->qmlContext(); + Q_ASSERT(ctx); + return ctx->asReturnedValue(); } ReturnedValue Runtime::method_regexpLiteral(ExecutionEngine *engine, int id) |