summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2009-09-29 01:17:24 (GMT)
committerBea Lam <bea.lam@nokia.com>2009-09-29 01:17:24 (GMT)
commitb9c5786bcda0fd48684c75b592d61bc427a9dba6 (patch)
tree4171057fab2143b077e368dc333dab3a30d5aa9f
parentef2e4bfcdd95506329ba1d8c6635999f07a474ff (diff)
downloadQt-b9c5786bcda0fd48684c75b592d61bc427a9dba6.zip
Qt-b9c5786bcda0fd48684c75b592d61bc427a9dba6.tar.gz
Qt-b9c5786bcda0fd48684c75b592d61bc427a9dba6.tar.bz2
Fix to not crash when viewing the value of a property that is a
QObject* (in this case, a QmlXmlListModel_QML_1*).
-rw-r--r--src/declarative/qml/qmlenginedebug.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index 9f0bae6..16129ee 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -318,8 +318,8 @@ void QmlEngineDebugServer::propertyChanged(int id, int objectId, const QByteArra
QByteArray reply;
QVariant v;
QDataStream rs(&reply, QIODevice::WriteOnly);
-
- if (value.type() == QVariant::UserType) {
+
+ if (value.type() == QVariant::UserType || QmlMetaType::isObject(value.userType())) {
QObject *o = QmlMetaType::toQObject(value);
if (o) {
QString objectName = o->objectName();