diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-04-30 21:47:28 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2013-05-01 09:33:39 +0200 |
commit | 3245b706bcd173aed34a981b592de0019e25c7d5 (patch) | |
tree | a2ec42eb07acf894994f6118b9d82ca45b379839 | |
parent | 369351cbf25d14137bd21409f9ffa15d6bba4ecf (diff) | |
download | qt-creator-3245b706bcd173aed34a981b592de0019e25c7d5.tar.gz |
Fix crash
Task-number: QTCREATORBUG-9230
Change-Id: I24a6277c9ca5f35c803e276da82ca2b9e9d79f57
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
-rw-r--r-- | src/plugins/debugger/qml/qmlinspectoragent.cpp | 10 | ||||
-rw-r--r-- | src/plugins/debugger/qml/qmlinspectoragent.h | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp index 3c3fcd80dd..5bb3538712 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.cpp +++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp @@ -60,7 +60,6 @@ QmlInspectorAgent::QmlInspectorAgent(DebuggerEngine *engine, QObject *parent) , m_engineQueryId(0) , m_rootContextQueryId(0) , m_objectToSelect(-1) - , m_newObjectsCreated(false) { m_debugIdToIname.insert(-1, QByteArray("inspect")); connect(debuggerCore()->action(ShowQmlObjectTree), @@ -810,11 +809,6 @@ QList<WatchData> QmlInspectorAgent::buildWatchData(const ObjectReference &obj, // element makes sure we're queried on expansion. if (obj.needsMoreData()) 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 @@ -882,10 +876,6 @@ void QmlInspectorAgent::clearObjectTree() m_debugIdToIname.clear(); m_debugIdToIname.insert(-1, QByteArray("inspect")); m_objectStack.clear(); - // reset only for qt > 4.8.3. - if (m_engineClient->objectName() != QLatin1String(QDECLARATIVE_ENGINE)) - m_newObjectsCreated = false; - removeAllObjectWatches(); } } // Internal diff --git a/src/plugins/debugger/qml/qmlinspectoragent.h b/src/plugins/debugger/qml/qmlinspectoragent.h index b50e8df9ca..c74831b66e 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.h +++ b/src/plugins/debugger/qml/qmlinspectoragent.h @@ -145,7 +145,6 @@ private: QList<int> m_objectWatches; QList<int> m_fetchDataIds; QTimer m_delayQueryTimer; - bool m_newObjectsCreated; }; } // Internal |