diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-20 23:49:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-20 23:49:38 (GMT) |
| commit | cca06c0d740be179d5196ad7919253b7d52392ed (patch) | |
| tree | eaa7be4f53fa9d91833db94c491593b540b17b31 /src/declarative/qml/qdeclarativeenginedebug.cpp | |
| parent | b0c95377cadcaa3aa784ca909e13033c85233912 (diff) | |
| parent | 2c39814588782f9b30f5205258f72fe5c1dea358 (diff) | |
| download | Qt-cca06c0d740be179d5196ad7919253b7d52392ed.zip Qt-cca06c0d740be179d5196ad7919253b7d52392ed.tar.gz Qt-cca06c0d740be179d5196ad7919253b7d52392ed.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QDeclarativeDebug: stream all the context, including the internals ones.
Diffstat (limited to 'src/declarative/qml/qdeclarativeenginedebug.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeenginedebug.cpp | 6 |
1 files changed, 2 insertions, 4 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; } |