diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-13 21:53:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-21 19:32:52 +0100 |
| commit | 9f717b650ea0a7efc4240240f957beba8d027bda (patch) | |
| tree | 8e3726ba5309703f56922a1083d2d595c6236912 /src/qml/jsruntime/qv4context.cpp | |
| parent | 2784a68d64519ccc5d01b6c1378207572cf1ebcd (diff) | |
Let the memory manager operate on Heap::Base objects, not Managed
Change-Id: Ib5c9b51dbf9c69abeda088094e6348dd545bf3c8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4context.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4context.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp index fee2be30dc..03858c13e7 100644 --- a/src/qml/jsruntime/qv4context.cpp +++ b/src/qml/jsruntime/qv4context.cpp @@ -94,7 +94,7 @@ Heap::CatchContext *ExecutionContext::newCatchContext(String *exceptionVarName, Heap::CallContext *ExecutionContext::newQmlContext(FunctionObject *f, Object *qml) { Scope scope(this); - Scoped<CallContext> c(scope, static_cast<CallContext*>(d()->engine->memoryManager->allocManaged(requiredMemoryForExecutionContect(f, 0)))); + Scoped<CallContext> c(scope, static_cast<Heap::CallContext*>(d()->engine->memoryManager->allocManaged(requiredMemoryForExecutionContect(f, 0)))); new (c->d()) Heap::CallContext(d()->engine, qml, f); return c->d(); } |