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

Fix crash

Browse Source 
Task-number: QTCREATORBUG-9230
Change-Id: I24a6277c9ca5f35c803e276da82ca2b9e9d79f57
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
This commit is contained in:
Orgad Shaneh
2013-04-30 21:47:28 +03:00
committed by Orgad Shaneh
parent 369351cbf2
commit 3245b706bc
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,6 @@ QmlInspectorAgent::QmlInspectorAgent(DebuggerEngine *engine, QObject *parent)
, m_engineQueryId(0) , m_engineQueryId(0)
, m_rootContextQueryId(0) , m_rootContextQueryId(0)
, m_objectToSelect(-1) , m_objectToSelect(-1)
, m_newObjectsCreated(false)
{ {
m_debugIdToIname.insert(-1, QByteArray("inspect")); m_debugIdToIname.insert(-1, QByteArray("inspect"));
connect(debuggerCore()->action(ShowQmlObjectTree), connect(debuggerCore()->action(ShowQmlObjectTree),
@@ -810,11 +809,6 @@ QList<WatchData> QmlInspectorAgent::buildWatchData(const ObjectReference &obj,
// element makes sure we're queried on expansion. // element makes sure we're queried on expansion.
if (obj.needsMoreData()) if (obj.needsMoreData())
return list; return list;
// To improve performance, we do not insert data for items
// that have not been previously queried when the object tree is refreshed.
if (m_newObjectsCreated)
append = false;
} }
// properties // properties
@@ -882,10 +876,6 @@ void QmlInspectorAgent::clearObjectTree()
m_debugIdToIname.clear(); m_debugIdToIname.clear();
m_debugIdToIname.insert(-1, QByteArray("inspect")); m_debugIdToIname.insert(-1, QByteArray("inspect"));
m_objectStack.clear(); m_objectStack.clear();
// reset only for qt > 4.8.3.
if (m_engineClient->objectName() != QLatin1String(QDECLARATIVE_ENGINE))
m_newObjectsCreated = false;
removeAllObjectWatches(); removeAllObjectWatches();
} }
} // Internal } // Internal

1
src/plugins/debugger/qml/qmlinspectoragent.h
View File

@@ -145,7 +145,6 @@ private:
QList<int> m_objectWatches; QList<int> m_objectWatches;
QList<int> m_fetchDataIds; QList<int> m_fetchDataIds;
QTimer m_delayQueryTimer; QTimer m_delayQueryTimer;
bool m_newObjectsCreated;
}; };
} // Internal } // Internal