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

QmlJSInspector: Select Items

Browse Source 
This fixes sending SetCurrentObjects to QDeclarativeObserver
when fetching the object tree.

Change-Id: I03c1264d2f464faa69a946654867636bce37a437
Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
Aurindam Jana
2012-04-16 11:15:49 +02:00
parent 6b8167c663
commit c51b281004
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmljsinspector/qmljsclientproxy.cpp
View File

@@ -186,7 +186,7 @@ void ClientProxy::onCurrentObjectsFetched(quint32 queryId, const QVariant &resul
return; return;
foreach (const QmlDebugObjectReference &o, m_fetchCurrentObjects) foreach (const QmlDebugObjectReference &o, m_fetchCurrentObjects)
addObjectToTree(o); addObjectToTree(o, false);
emit selectedItemsChanged(QList<QmlDebugObjectReference>() << emit selectedItemsChanged(QList<QmlDebugObjectReference>() <<
m_fetchCurrentObjects.last()); m_fetchCurrentObjects.last());
} }
@@ -230,13 +230,14 @@ void ClientProxy::setSelectedItemsByObjectId(
} }
} }
void ClientProxy::addObjectToTree(const QmlDebugObjectReference &obj) void ClientProxy::addObjectToTree(const QmlDebugObjectReference &obj, bool notify)
{ {
int count = m_rootObjects.count(); int count = m_rootObjects.count();
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
if (m_rootObjects[i].insertObjectInTree(obj)) { if (m_rootObjects[i].insertObjectInTree(obj)) {
buildDebugIdHashRecursive(obj); buildDebugIdHashRecursive(obj);
emit objectTreeUpdated(); if (notify)
emit objectTreeUpdated();
break; break;
} }
} }

2
src/plugins/qmljsinspector/qmljsclientproxy.h
View File

@@ -95,7 +95,7 @@ public:
Debugger::QmlAdapter *qmlAdapter() const; Debugger::QmlAdapter *qmlAdapter() const;
quint32 fetchContextObject(const QmlDebugObjectReference& obj); quint32 fetchContextObject(const QmlDebugObjectReference& obj);
void addObjectToTree(const QmlDebugObjectReference &obj); void addObjectToTree(const QmlDebugObjectReference &obj, bool notify = true);
void fetchRootObjects(const QmlDebugContextReference &context, bool clear); void fetchRootObjects(const QmlDebugContextReference &context, bool clear);
void insertObjectInTreeIfNeeded(const QmlDebugObjectReference &object); void insertObjectInTreeIfNeeded(const QmlDebugObjectReference &object);