Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2

1 files changed, 5 insertions, 5 deletions

diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index d3caa95..654157c 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -119,8 +119,7 @@ QmlEngineDebugServer::propertyData(QObject *obj, int propIdx)
         rv.type = QmlObjectProperty::Basic;
     } else if (QmlMetaType::isQObject(prop.userType()))  {
         rv.type = QmlObjectProperty::Object;
-    } else if (QmlMetaType::isList(prop.userType()) ||
-               QmlMetaType::isQmlList(prop.userType())) {
+    } else if (QmlMetaType::isList(prop.userType())) {
         rv.type = QmlObjectProperty::List;
     }
 
@@ -133,14 +132,15 @@ QVariant QmlEngineDebugServer::valueContents(const QVariant &value) const
     if (QVariant::Type(userType) < QVariant::UserType)
         return value;
 
-
-    if (QmlMetaType::isList(userType) || QmlMetaType::isQmlList(userType)) {
+    /*
+    if (QmlMetaType::isList(userType)) {
         int count = QmlMetaType::listCount(value);
         QVariantList contents;
         for (int i=0; i<count; i++)
             contents << valueContents(QmlMetaType::listAt(value, i));
         return contents;
-    } else if (QmlMetaType::isQObject(userType)) {
+    } else */
+    if (QmlMetaType::isQObject(userType)) {
         QObject *o = QmlMetaType::toQObject(value);
         if (o) {
             QString name = o->objectName();