feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Split updateWatchData() paths

Browse Source 
There are two cases that do not coincide in asynchronous
engines such as the QmlEngine: Inserting a new watch item,
and expanding the children of an existing item.

Change-Id: Ic98a5f1e89aca37146039a241de737c407606e83
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-07-15 17:14:29 +02:00
parent 66964ac91c
commit 63c5fc034b
10 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -969,26 +969,31 @@ void QmlEngine::assignValueInDebugger(WatchItem *item,
}
}
void QmlEngine::updateWatchData(const QByteArray &iname)
void QmlEngine::expandItem(const QByteArray &iname)
{
const WatchItem *item = watchHandler()->findItem(iname);
// invalid expressions or out of scope variables
if (!item)
return;
QTC_ASSERT(item, return);
if (item->isInspect()) {
d->inspectorAdapter.agent()->updateWatchData(*item);
} else {
if (!item->name.isEmpty()) {
if (item->isChildrenNeeded() && watchHandler()->isExpandedIName(item->iname)) {
LookupItems items;
items.insert(int(item->id), {item->iname, item->name});
d->lookup(items);
}
}
LookupItems items;
items.insert(int(item->id), {item->iname, item->name});
d->lookup(items);
}
}
void QmlEngine::updateItem(const QByteArray &iname)
{
const WatchItem *item = watchHandler()->findItem(iname);
QTC_ASSERT(item, return);
QString exp = QString::fromUtf8(item->exp);
d->evaluate(exp, [this, exp](const QVariantMap &response) {
d->handleEvaluateWatcher(response, exp);
});
}
void QmlEngine::selectWatchData(const QByteArray &iname)
{
const WatchItem *item = watchHandler()->findItem(iname);