summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimjees Abraham <simjees.abraham@nokia.com>2012-06-08 13:13:54 +0200
committerAurindam Jana <aurindam.jana@nokia.com>2012-06-11 09:58:10 +0200
commitfdabb6d6f934ab55c6ba59a0b504d24148d7e1ef (patch)
tree8858f30e3ca6fc67f82036360116b3dcbe0c9d4d
parent953334967c1df54a2c0e7256fdf1e343a37109d7 (diff)
downloadqt-creator-fdabb6d6f934ab55c6ba59a0b504d24148d7e1ef.tar.gz
Debugger: resetting of newObjectsCreated done only for Qt5.x
done to correct the regression introduced in 2574a5846983a3016e551432d24f8d8d4e3b97b5 Change-Id: I0d9fb8fabcd134f53f1a1c9d0fa04ca7b542a88c Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
-rw-r--r--src/plugins/debugger/qml/qmlinspectoragent.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp
index 240dad0195..8428931392 100644
--- a/src/plugins/debugger/qml/qmlinspectoragent.cpp
+++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp
@@ -879,7 +879,9 @@ void QmlInspectorAgent::clearObjectTree()
m_debugIdToIname.clear();
m_debugIdChildIds.clear();
m_objectStack.clear();
- m_newObjectsCreated = false;
+ // reset only for 5.x.
+ if (m_engineClient->objectName() == QmlDebug::Constants::QML_DEBUGGER)
+ m_newObjectsCreated = false;
removeAllObjectWatches();
}