diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-12-02 12:46:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-20 10:07:39 +0100 |
| commit | a8efa705ac21ec020474b9dcc8ab454ddedad037 (patch) | |
| tree | bcd2ac0ddee28fb48cde2ccba13467864db33711 /src/qml/jsruntime/qv4runtime.cpp | |
| parent | f2253e6b59e3e8a5d8524b766c03ce79389a4870 (diff) | |
Fix Context::getPropertyAndBase to use Heap based objects
Change-Id: I4f885a8af5e963445959871b7f26f3bcb3dfa654
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4runtime.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index c4c0fd416c..9b8912fecb 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -924,10 +924,8 @@ ReturnedValue Runtime::callActivationProperty(ExecutionEngine *engine, int nameI ScopedString name(scope, engine->currentContext()->compilationUnit->runtimeStrings[nameIndex]); ScopedObject base(scope); - Object *baseObj = 0; ScopedContext ctx(scope, engine->currentContext()); - ScopedValue func(scope, ctx->getPropertyAndBase(name, baseObj)); - base.ptr->m = baseObj ? &baseObj->data : 0; + ScopedValue func(scope, ctx->getPropertyAndBase(name, base.getRef())); if (scope.engine->hasException) return Encode::undefined(); |