Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 16 insertions, 7 deletions

diff --git a/tools/qmldebugger/objectpropertiesview.cpp b/tools/qmldebugger/objectpropertiesview.cpp
index f725194..61afe3f 100644
--- a/tools/qmldebugger/objectpropertiesview.cpp
+++ b/tools/qmldebugger/objectpropertiesview.cpp
@@ -22,12 +22,12 @@ public:
 };
 
 PropertiesViewItem::PropertiesViewItem(QTreeWidget *widget)
-: QTreeWidgetItem(widget)
+    : QTreeWidgetItem(widget)
 {
 }
 
 PropertiesViewItem::PropertiesViewItem(QTreeWidgetItem *parent)
-: QTreeWidgetItem(parent)
+    : QTreeWidgetItem(parent)
 {
 }
 
@@ -108,8 +108,10 @@ void ObjectPropertiesView::setObject(const QmlDebugObjectReference &object)
 
         item->setText(0, p.name());
         item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-        if (!p.hasNotifySignal())
-            item->setForeground(0, Qt::lightGray);
+        if (!p.hasNotifySignal()) {
+            item->setForeground(0, Qt::gray);
+            item->setForeground(1, Qt::gray);
+        }
 
         if (!p.binding().isEmpty()) {
             PropertiesViewItem *binding = new PropertiesViewItem(item);
@@ -159,15 +161,22 @@ void ObjectPropertiesView::valueChanged(const QByteArray &name, const QVariant &
 {
     for (int i=0; i<m_tree->topLevelItemCount(); i++) {
         PropertiesViewItem *item = static_cast<PropertiesViewItem *>(m_tree->topLevelItem(i));
-        if (item->property.name() == name)
-            item->setText(1, value.toString());
+        if (item->property.name() == name) {
+            if (value.isNull()) {
+                item->setText(1, QLatin1String("<null>")
+                        + QLatin1String(" : ")
+                        + item->property.valueTypeName());
+            } else {
+                item->setText(1, value.toString());
+            }
+        }
     }
 }
 
 void ObjectPropertiesView::itemActivated(QTreeWidgetItem *i)
 {
     PropertiesViewItem *item = static_cast<PropertiesViewItem *>(i);
-    if (!item->property.name().isEmpty() && item->property.hasNotifySignal())
+    if (!item->property.name().isEmpty())
         emit activated(m_object, item->property);
 }