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

Merge remote-tracking branch 'origin/3.5'

Browse Source 
Change-Id: Iebaabfc2f724cd493b7cab025406531cea5cd2dc
This commit is contained in:
Eike Ziller
2015-09-01 12:57:51 +02:00
parent fb73a87033 a80f4d179b
commit 3b1a966cc8
62 changed files with 2582 additions and 2354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/qml/qmlinspectoragent.cpp
View File

@@ -597,6 +597,7 @@ void QmlInspectorAgent::addWatchData(const ObjectReference &obj,
bool append)
{
qCDebug(qmlInspectorLog) << '(' << obj << parentIname << ')';
QTC_ASSERT(m_qmlEngine, return);
int objDebugId = obj.debugId();
QByteArray objIname = buildIName(parentIname, objDebugId);
@@ -689,7 +690,8 @@ bool QmlInspectorAgent::isConnected() const
void QmlInspectorAgent::clearObjectTree()
{
m_qmlEngine->watchHandler()->removeAllData(true);
if (m_qmlEngine)
m_qmlEngine->watchHandler()->removeAllData(true);
m_objectTreeQueryIds.clear();
m_fetchDataIds.clear();
int old_count = m_debugIdHash.count();