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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I1310d473584f1e2cd44008d45747c868103bbde1
This commit is contained in:
Eike Ziller
2013-07-12 10:39:18 +02:00
parent b99de1de58 a699dc3c71
commit 21f63c24c7
17 changed files with 382 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/debugger/qml/qmlv8debuggerclient.cpp
View File

@@ -1770,11 +1770,19 @@ QmlJS::ConsoleItem *constructLogItemTree(QmlJS::ConsoleItem *parent,
ConsoleItem *item = new ConsoleItem(parent, ConsoleItem::UndefinedType, text);
QSet<QString> childrenFetched;
foreach (const QVariant &property, objectData.properties) {
ConsoleItem *child = constructLogItemTree(item, extractData(property, refsVal),
refsVal);
if (child)
const QmlV8ObjectData childObjectData = extractData(property, refsVal);
if (childObjectData.handle == objectData.handle)
continue;
ConsoleItem *child = constructLogItemTree(item, childObjectData, refsVal);
if (child) {
const QString text = child->text();
if (childrenFetched.contains(text))
continue;
childrenFetched.insert(text);
item->insertChild(child, sorted);
}
}
return item;