aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4script.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-11-11 16:07:54 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2014-11-12 12:13:54 +0100
commit9bad6eea0f30f6a6c1878c2773dc39071cb41584 (patch)
tree2306235d1db4f4abce697de2564a935229517bfd /src/qml/jsruntime/qv4script.cpp
parent345a5ee67bf80f7c18869fe080bf7dd7cf4a0d90 (diff)
Change signature or runtime methods to take an engine pointer
This makes a lot more sense in the long term and is the more maintainable solution, once the GC starts moving objects around in memory Change-Id: I8f327c0f5b5b0af38c5fe1a217852ee8c4a5c2fc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4script.cpp')
-rw-r--r--src/qml/jsruntime/qv4script.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index 71a8284ec1..956c48e74b 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -144,7 +144,7 @@ ReturnedValue QmlBindingWrapper::call(Managed *that, CallData *)
Scoped<CallContext> ctx(scope, This->d()->qmlContext);
std::fill(ctx->d()->locals, ctx->d()->locals + ctx->d()->function->varCount(), Primitive::undefinedValue());
engine->pushContext(ctx);
- ScopedValue result(scope, This->function()->code(ctx, This->function()->codeData));
+ ScopedValue result(scope, This->function()->code(engine, This->function()->codeData));
engine->popContext();
return result.asReturnedValue();
@@ -307,7 +307,7 @@ ReturnedValue Script::run()
scope->d()->lookups = vmFunction->compilationUnit->runtimeLookups;
scope->d()->compilationUnit = vmFunction->compilationUnit;
- return vmFunction->code(scope, vmFunction->codeData);
+ return vmFunction->code(engine, vmFunction->codeData);
} else {
ScopedObject qmlObj(valueScope, qml.value());
ScopedFunctionObject f(valueScope, engine->memoryManager->alloc<QmlBindingWrapper>(scope, vmFunction, qmlObj));