aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-08-09 17:26:24 +0200
committerLars Knoll <lars.knoll@qt.io>2017-08-10 08:20:23 +0000
commit13f603aba593282493ef8d033a91c6dbac931a9f (patch)
treeca0db6876469cbd181be3c2d5e6852f2cf4d31e7 /src
parent4acb72bf35e736f222c90e49b3e84e20355d33a7 (diff)
Pass the correct this object to eval
Change-Id: I89e4fb440ff33c94be92632fbdf8454f4c0f6c89 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/qml/jsruntime/qv4globalobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp
index f8886cb47f..d8f0535f63 100644
--- a/src/qml/jsruntime/qv4globalobject.cpp
+++ b/src/qml/jsruntime/qv4globalobject.cpp
@@ -384,7 +384,7 @@ ReturnedValue EvalFunction::evalCall(CallData *callData, bool directCall) const
ctx->d()->v4Function = function;
ScopedCallData cData(scope);
- cData->thisObject = Encode::undefined(); // ####
+ cData->thisObject = scope.engine->currentStackFrame->thisObject();
return function->execute(ctx->d(), cData);
}