diff options
| author | hjk <hjk@theqtcompany.com> | 2015-07-06 13:11:01 +0200 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2015-07-06 12:44:01 +0000 |
| commit | 82cffd830a90d4da604fcfd8a721474241caec9a (patch) | |
| tree | cdeaba35e48350b552c3c8e26a9a5fc6a9c61de2 /src/plugins/debugger/qml/qmlv8debuggerclient.cpp | |
| parent | 5467fc25ea9ceeff087b16307b0eda5846d8583e (diff) | |
| download | qt-creator-82cffd830a90d4da604fcfd8a721474241caec9a.tar.gz | |
Debugger: Keep variable expansion state when stepping in QML
Change-Id: Ic9ea62de2d12736ae672cef6ea63376637dc30e6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'src/plugins/debugger/qml/qmlv8debuggerclient.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlv8debuggerclient.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp index cc4536ad27..c821da13a0 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp +++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp @@ -1443,6 +1443,7 @@ void QmlV8DebuggerClient::setCurrentFrameDetails(const QVariant &bodyVal, const StackHandler *stackHandler = d->engine->stackHandler(); WatchHandler * watchHandler = d->engine->watchHandler(); + watchHandler->notifyUpdateStarted(); d->clearCache(); const int frameIndex = stackHandler->currentIndex(); @@ -1454,7 +1455,6 @@ void QmlV8DebuggerClient::setCurrentFrameDetails(const QVariant &bodyVal, const if (item && item->isLocal()) handlesToLookup.insert(item->id, iname); } - watchHandler->removeAllData(); if (frameIndex < 0) return; const StackFrame frame = stackHandler->currentFrame(); @@ -1556,6 +1556,8 @@ void QmlV8DebuggerClient::updateScope(const QVariant &bodyVal, const QVariant &r if (!handlesToLookup.isEmpty()) d->lookup(handlesToLookup); + else + d->engine->watchHandler()->notifyUpdateFinished(); } QmlJS::ConsoleItem *constructLogItemTree(QmlJS::ConsoleItem *parent, @@ -1702,6 +1704,7 @@ void QmlV8DebuggerClient::expandLocalsAndWatchers(const QVariant &bodyVal, const d->engine->watchHandler()->insertItem(item); } } + d->engine->watchHandler()->notifyUpdateFinished(); } void QmlV8DebuggerClient::createWatchDataList(const WatchItem *parent, |