4 files changed, 31 insertions, 16 deletions

diff --git a/src/declarative/debugger/qmldebug.cpp b/src/declarative/debugger/qmldebug.cpp
index 75418e8..2537ec0 100644
--- a/src/declarative/debugger/qmldebug.cpp
+++ b/src/declarative/debugger/qmldebug.cpp
@@ -117,6 +117,7 @@ void QmlEngineDebugPrivate::decode(QDataStream &ds, QmlDebugObjectReference &o,
         prop.m_name = data.name;
         prop.m_binding = data.binding;
         prop.m_hasNotifySignal = data.hasNotifySignal;
+        prop.m_valueTypeName = data.valueTypeName;
         if (data.type == QmlEngineDebugServer::QmlObjectProperty::Basic)
             prop.m_value = data.value;
         else if (data.type == QmlEngineDebugServer::QmlObjectProperty::Object) {
@@ -124,7 +125,6 @@ void QmlEngineDebugPrivate::decode(QDataStream &ds, QmlDebugObjectReference &o,
             obj.m_debugId = prop.m_value.toInt();
             prop.m_value = qVariantFromValue(obj);
         }
-
         o.m_properties << prop;
     }
 
@@ -812,13 +812,17 @@ QmlDebugPropertyReference::QmlDebugPropertyReference()
 }
 
 QmlDebugPropertyReference::QmlDebugPropertyReference(const QmlDebugPropertyReference &o)
-: m_objectDebugId(o.m_objectDebugId), m_name(o.m_name), m_value(o.m_value), m_binding(o.m_binding), m_hasNotifySignal(o.m_hasNotifySignal)
+: m_objectDebugId(o.m_objectDebugId), m_name(o.m_name), m_value(o.m_value),
+  m_valueTypeName(o.m_valueTypeName), m_binding(o.m_binding),
+  m_hasNotifySignal(o.m_hasNotifySignal)
 {
 }
 
 QmlDebugPropertyReference &QmlDebugPropertyReference::operator=(const QmlDebugPropertyReference &o)
 {
-    m_objectDebugId = o.m_objectDebugId; m_name = o.m_name; m_value = o.m_value; m_binding = o.m_binding; m_hasNotifySignal = o.m_hasNotifySignal;
+    m_objectDebugId = o.m_objectDebugId; m_name = o.m_name; m_value = o.m_value;
+    m_valueTypeName = o.m_valueTypeName; m_binding = o.m_binding;
+    m_hasNotifySignal = o.m_hasNotifySignal;
     return *this;
 }
 
@@ -832,6 +836,11 @@ QString QmlDebugPropertyReference::name() const
     return m_name;
 }
 
+QString QmlDebugPropertyReference::valueTypeName() const
+{
+    return m_valueTypeName;
+}
+
 QVariant QmlDebugPropertyReference::value() const
 {
     return m_value;
diff --git a/src/declarative/debugger/qmldebug.h b/src/declarative/debugger/qmldebug.h
index 153a10f..bd076ff 100644
--- a/src/declarative/debugger/qmldebug.h
+++ b/src/declarative/debugger/qmldebug.h
@@ -232,6 +232,7 @@ public:
     int objectDebugId() const;
     QString name() const;
     QVariant value() const;
+    QString valueTypeName() const;
     QString binding() const;
     bool hasNotifySignal() const;
 
@@ -240,6 +241,7 @@ private:
     int m_objectDebugId;
     QString m_name;
     QVariant m_value;
+    QString m_valueTypeName;
     QString m_binding;
     bool m_hasNotifySignal;
 };
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index bbe6f77..7178e6c 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -80,7 +80,8 @@ QDataStream &operator>>(QDataStream &ds,
 QDataStream &operator<<(QDataStream &ds, 
                         const QmlEngineDebugServer::QmlObjectProperty &data)
 {
-    ds << (int)data.type << data.name << data.value << data.binding << data.hasNotifySignal;
+    ds << (int)data.type << data.name << data.value << data.valueTypeName
+       << data.binding << data.hasNotifySignal;
     return ds;
 }
 
@@ -88,7 +89,8 @@ QDataStream &operator>>(QDataStream &ds,
                         QmlEngineDebugServer::QmlObjectProperty &data)
 {
     int type;
-    ds >> type >> data.name >> data.value >> data.binding >> data.hasNotifySignal;
+    ds >> type >> data.name >> data.value >> data.valueTypeName
+       >> data.binding >> data.hasNotifySignal;
     data.type = (QmlEngineDebugServer::QmlObjectProperty::Type)type;
     return ds;
 }
@@ -101,6 +103,7 @@ QmlEngineDebugServer::propertyData(QObject *obj, int propIdx)
     QMetaProperty prop = obj->metaObject()->property(propIdx);
 
     rv.type = QmlObjectProperty::Unknown;
+    rv.valueTypeName = QString::fromUtf8(prop.typeName());
     rv.name = prop.name();
     rv.hasNotifySignal = prop.hasNotifySignal();
     QmlAbstractBinding *binding = QmlMetaProperty(obj, rv.name).binding();
@@ -116,6 +119,7 @@ QmlEngineDebugServer::propertyData(QObject *obj, int propIdx)
                QmlMetaType::isQmlList(prop.userType())) {
         rv.type = QmlObjectProperty::List;
     }
+
     return rv;
 }
 
@@ -149,7 +153,7 @@ void QmlEngineDebugServer::buildObjectList(QDataStream &message,
     int ctxtId = QmlDebugService::idForObject(ctxt);
 
     message << ctxtName << ctxtId; 
-    
+
     int count = 0;
 
     for (QSet<QmlContext *>::ConstIterator iter = p->childContexts.begin();
@@ -186,6 +190,12 @@ void QmlEngineDebugServer::buildObjectList(QDataStream &message,
 
 QVariant QmlEngineDebugServer::serializableVariant(const QVariant &value)
 {
+    if (value.type() < QVariant::UserType)
+        return value;
+
+    if (!value.toString().isEmpty())
+        return value.toString();
+
     QVariant v;
     if (value.type() == QVariant::UserType || QmlMetaType::isObject(value.userType())) {
         QObject *o = QmlMetaType::toQObject(value);
@@ -195,19 +205,12 @@ QVariant QmlEngineDebugServer::serializableVariant(const QVariant &value)
                 objectName = QLatin1String("<unnamed>");
             v = QString::fromUtf8(o->metaObject()->className()) +
                 QLatin1String(": ") + objectName;
-        } else {
-            v = QString::fromUtf8(value.typeName());
-        }
-        if (v.isNull()) {
-            QString s = value.toString();
-            if (s.isEmpty())
-                s = QLatin1String("<unknown>");
-            v = s;
         }
-    } else {
-        v = value;
     }
 
+    if (v.isNull())
+        v = QString::fromUtf8(value.typeName());
+
     return v;
 }
 
diff --git a/src/declarative/qml/qmlenginedebug_p.h b/src/declarative/qml/qmlenginedebug_p.h
index 9ad198a..075a711 100644
--- a/src/declarative/qml/qmlenginedebug_p.h
+++ b/src/declarative/qml/qmlenginedebug_p.h
@@ -85,6 +85,7 @@ public:
         Type type;
         QString name;
         QVariant value;
+        QString valueTypeName;
         QString binding;
         bool hasNotifySignal;
     };