summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlenginedebug.cpp
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2009-11-09 03:07:05 (GMT)
committerBea Lam <bea.lam@nokia.com>2009-11-09 03:07:05 (GMT)
commit11bbed0a7cfd4b5295109341c3dc6df339b4df05 (patch)
treee590176df24436796cc3b7a88793f9c47f04dadb /src/declarative/qml/qmlenginedebug.cpp
parent2fb5889ea55209528fd19b7a34faac7c5be2b1b4 (diff)
downloadQt-11bbed0a7cfd4b5295109341c3dc6df339b4df05.zip
Qt-11bbed0a7cfd4b5295109341c3dc6df339b4df05.tar.gz
Qt-11bbed0a7cfd4b5295109341c3dc6df339b4df05.tar.bz2
QmlContext objects shouldn't be added to object tree.
Diffstat (limited to 'src/declarative/qml/qmlenginedebug.cpp')
-rw-r--r--src/declarative/qml/qmlenginedebug.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index 52d54b9..20d6fc1 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -99,6 +99,7 @@ QmlEngineDebugServer::QmlObjectProperty
QmlEngineDebugServer::propertyData(QObject *obj, int propIdx)
{
QmlObjectProperty rv;
+;
QMetaProperty prop = obj->metaObject()->property(propIdx);
@@ -165,7 +166,7 @@ void QmlEngineDebugServer::buildObjectDump(QDataStream &message,
int childrenCount = children.count();
for (int ii = 0; ii < children.count(); ++ii) {
- if (QmlBoundSignal::cast(children[ii]))
+ if (qobject_cast<QmlContext*>(children[ii]) || QmlBoundSignal::cast(children[ii]))
--childrenCount;
}
@@ -175,6 +176,8 @@ void QmlEngineDebugServer::buildObjectDump(QDataStream &message,
for (int ii = 0; ii < children.count(); ++ii) {
QObject *child = children.at(ii);
+ if (qobject_cast<QmlContext*>(child))
+ continue;
QmlBoundSignal *signal = QmlBoundSignal::cast(child);
if (signal) {
QmlObjectProperty prop;