aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4context.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-08-07 08:10:15 +0200
committerLars Knoll <lars.knoll@qt.io>2017-08-10 08:18:05 +0000
commitfd221cf6e056b7239fc2fa2faeccd9ddeb542199 (patch)
treea453f21ac01aa01a16a7a4f378ec2ed60e07512f /src/qml/jsruntime/qv4context.cpp
parent01c338023a3a604bb24c2efb18d48f9bac33e6bc (diff)
Introduce a JS stack frame that corresponds to the C++ stack frame
The frame currently contains the function itself and the current context. Change-Id: I7d3402627fbc90e860a7bdc277585f365f5b4cb5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4context.cpp')
-rw-r--r--src/qml/jsruntime/qv4context.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp
index 1019770275..8678529916 100644
--- a/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@ -244,7 +244,7 @@ ReturnedValue ExecutionContext::call(ExecutionEngine *engine, CallData *callData
ctx->d()->function.set(engine, f->d());
engine->pushContext(ctx);
- ReturnedValue res = Q_V4_PROFILE(engine, function);
+ ReturnedValue res = Q_V4_PROFILE(engine, function, f);
if (function->hasQmlDependencies)
QQmlPropertyCapture::registerQmlDependencies(engine, function->compiledFunction);
@@ -271,7 +271,7 @@ ReturnedValue QV4::ExecutionContext::simpleCall(ExecutionEngine *engine, CallDat
engine->pushContext(ctx);
Q_ASSERT(engine->current == ctx);
- ReturnedValue res = Q_V4_PROFILE(engine, function);
+ ReturnedValue res = Q_V4_PROFILE(engine, function, 0);
if (function->hasQmlDependencies)
QQmlPropertyCapture::registerQmlDependencies(engine, function->compiledFunction);