From 2c39814588782f9b30f5205258f72fe5c1dea358 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 20 Aug 2010 17:36:49 +0200 Subject: QDeclarativeDebug: stream all the context, including the internals ones. Some public context are within the internal context, so we need to stream them to get every objects Reviewed-by: Lasse Holmstedt --- src/declarative/qml/qdeclarativeenginedebug.cpp | 6 ++---- tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp index ed98e3c..688e0fc 100644 --- a/src/declarative/qml/qdeclarativeenginedebug.cpp +++ b/src/declarative/qml/qdeclarativeenginedebug.cpp @@ -264,8 +264,7 @@ void QDeclarativeEngineDebugServer::buildObjectList(QDataStream &message, QDecla QDeclarativeContextData *child = p->childContexts; while (child) { - if (!child->isInternal) - ++count; + ++count; child = child->nextChild; } @@ -273,8 +272,7 @@ void QDeclarativeEngineDebugServer::buildObjectList(QDataStream &message, QDecla child = p->childContexts; while (child) { - if (!child->isInternal) - buildObjectList(message, child->asQDeclarativeContext()); + buildObjectList(message, child->asQDeclarativeContext()); child = child->nextChild; } diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp index 4a945f3..20ccccb 100644 --- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp +++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp @@ -636,7 +636,7 @@ void tst_QDeclarativeDebug::queryRootContexts() QCOMPARE(context.objects()[0].properties().count(), 0); QCOMPARE(context.objects()[0].children().count(), 0); - QCOMPARE(context.contexts().count(), 1); + QCOMPARE(context.contexts().count(), 4); QVERIFY(context.contexts()[0].debugId() >= 0); QCOMPARE(context.contexts()[0].name(), QString("tst_QDeclarativeDebug_childContext")); -- cgit v0.12