diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-05-03 09:49:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-05-03 09:49:28 +0200 |
| commit | a2171c2d82b810e7f596f371a7d1d3cc6989a9dd (patch) | |
| tree | ec43bcfea024aafa51bc0c698c37b9a0762a047e /src/plugins/debugger/qml/qmlinspectoragent.cpp | |
| parent | 364c95476e3a74898bf4d0884670765bb7b9f592 (diff) | |
| parent | 6999e3c33907c0b4b09902f18dee0407c6d6293e (diff) | |
| download | qt-creator-a2171c2d82b810e7f596f371a7d1d3cc6989a9dd.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
Diffstat (limited to 'src/plugins/debugger/qml/qmlinspectoragent.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlinspectoragent.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp index 0c2de93fcc..8a65a59ab0 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.cpp +++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp @@ -61,7 +61,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), @@ -811,11 +810,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 @@ -886,10 +880,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 |