diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-06-11 16:35:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-18 16:42:58 +0000 |
| commit | f077bf13efee6d57261f76544e89a10acafb5a9c (patch) | |
| tree | 9a438cd2cee32153586a477c22fea62b703199e5 /src/qml/jsruntime/qv4engine.cpp | |
| parent | fe9b63780da81fa8e3746e519dda320d57436503 (diff) | |
Clean up ExecutionContext's for QML
Create a specialized QmlContext instead of re-using
a call context with a QQmlContextWrapper as activation
object.
This saves some memory and opens up the route to getting
rid of the context wrapper in a future commit.
Change-Id: I1591c73932a08564fddf5137ac05bbc6f31dd4d5
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 2ac56f52c5..3d541e53a3 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -737,8 +737,8 @@ Heap::Object *ExecutionEngine::qmlContextObject() const if (ctx->type != Heap::ExecutionContext::Type_QmlContext) return 0; - Q_ASSERT(static_cast<Heap::CallContext *>(ctx)->activation); - return static_cast<Heap::CallContext *>(ctx)->activation; + Q_ASSERT(static_cast<Heap::QmlContext *>(ctx)->qml); + return static_cast<Heap::QmlContext *>(ctx)->qml; } QVector<StackFrame> ExecutionEngine::stackTrace(int frameLimit) const |