Give more info about whether a value is null and its value type.

2 files changed, 14 insertions, 3 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;
 };