From bad85119bf35468292cfd80ecc934b66515f0c68 Mon Sep 17 00:00:00 2001 From: Maximilian Goldstein Date: Wed, 2 Dec 2020 13:08:57 +0100 Subject: qv4qmlcontext: Fix bounded signal expressions when debugging Fixes: QTBUG-83599 Pick-to: 5.15 Change-Id: I8909f0b2d3eca909512b99c172c8dc5e93e48482 Reviewed-by: Ulf Hermann --- src/qml/jsruntime/qv4qmlcontext.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/jsruntime/qv4qmlcontext.cpp') diff --git a/src/qml/jsruntime/qv4qmlcontext.cpp b/src/qml/jsruntime/qv4qmlcontext.cpp index b6b268fc9b..fbfc66e8d8 100644 --- a/src/qml/jsruntime/qv4qmlcontext.cpp +++ b/src/qml/jsruntime/qv4qmlcontext.cpp @@ -471,9 +471,9 @@ ReturnedValue QQmlContextWrapper::resolveQmlContextPropertyLookupGetter(Lookup * return static_cast(ctx)->locals[index].asReturnedValue(); } - // Skip only block contexts within the current call context. + // Skip only block and call contexts. // Other contexts need a regular QML property lookup. See below. - if (ctx->type != Heap::ExecutionContext::Type_BlockContext) + if (ctx->type != Heap::ExecutionContext::Type_BlockContext && ctx->type != Heap::ExecutionContext::Type_CallContext) break; } -- cgit v1.2.3