From 2d72f97328f3d379476034549a26f1002c0b5fbc Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@nokia.com>
Date: Fri, 17 Feb 2012 11:09:31 +0100
Subject: DeclarativeEngineDebugService: Fix Crash

Iterate through contents of QVariantMap to convert
QObjects to streamable type.

Change-Id: I2cb64a84aef674904de43f9a0c0fee539b87a59a
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
---
 src/declarative/debugger/qdeclarativeenginedebugservice.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src/declarative/debugger')

diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp b/src/declarative/debugger/qdeclarativeenginedebugservice.cpp
index cd500e1ad6..4943959c33 100644
--- a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativeenginedebugservice.cpp
@@ -176,6 +176,9 @@ QVariant QDeclarativeEngineDebugService::valueContents(const QVariant &value) co
 {
     int userType = value.userType();
 
+    //QObject * is not streamable.
+    //Convert all such instances to a String value
+
     if (value.type() == QVariant::List) {
         QVariantList contents;
         QVariantList list = value.toList();
@@ -185,6 +188,16 @@ QVariant QDeclarativeEngineDebugService::valueContents(const QVariant &value) co
         return contents;
     }
 
+    if (value.type() == QVariant::Map) {
+        QVariantMap contents;
+        QMapIterator<QString, QVariant> i(value.toMap());
+         while (i.hasNext()) {
+             i.next();
+             contents.insert(i.key(), valueContents(i.value()));
+         }
+        return contents;
+    }
+
     if (QDeclarativeValueTypeFactory::isValueType(userType))
         return value;
 
-- 
cgit v1.2.3