From a28f73971a0497504d5aee01f791871a404bb381 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 14 Apr 2016 08:52:49 +0200 Subject: [PATCH] Debugger: Keep 'this' expanded while stepping Change-Id: Ib72a10e5dbf54c7586254ed513718631e5289b37 Task-number: QTCREATORBUG-15747 Reviewed-by: Christian Stenger --- src/plugins/debugger/qml/qmlengine.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index efac48ae07f..28464b35a88 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -2204,12 +2204,15 @@ void QmlEnginePrivate::handleFrame(const QVariantMap &response) } } - // Expand locals and watchers that were previously expanded + // Expand locals that were previously expanded. local.this and watch.* + // trigger updates in there handleEvaluatedExpression handlers. LookupItems itemsToLookup; foreach (const QByteArray &iname, watchHandler->expandedINames()) { - const WatchItem *item = watchHandler->findItem(iname); - if (item && item->isLocal()) - itemsToLookup.insert(int(item->id), {item->iname, item->name, item->exp}); + if (iname != "local.this") { + const WatchItem *item = watchHandler->findItem(iname); + if (item && item->isLocal()) + itemsToLookup.insert(int(item->id), {item->iname, item->name, item->exp}); + } } lookup(itemsToLookup); }