Convert QObjects in QVariantMaps

QObjects that are present in an array are already converted to
an object identifier.  This does the same for variant maps, which
end up as ECMAScript objects.

This allows QObjects put into a QVariantMap to be properly
deserialized.  For example, if a property is declared as such:

Q_PROPERTY(QVariantMap propName READ propName CONSTANT)

And propName is:

QVariantMap propName() const {
  QVariantMap map;
  map.insert("theProperty", QVariant::fromValue(someQObject));
  return map;
}

The "theProperty" property will now properly refer to the object.

Change-Id: I3c6e71b860f6825a31eb337aeffa55302287c8ff
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/examples/webchannel/shared/qwebchannel.js b/examples/webchannel/shared/qwebchannel.js
index 5b047c2..d75e148 100644
--- a/examples/webchannel/shared/qwebchannel.js
+++ b/examples/webchannel/shared/qwebchannel.js
@@ -197,10 +197,16 @@ function QObject(name, data, webChannel)
             }
             return ret;
         }
-        if (!response
-            || !response["__QObject*__"]
-            || response.id === undefined) {
+        if (!(response instanceof Object))
             return response;
+
+        if (!response["__QObject*__"]
+            || response.id === undefined) {
+            var jObj = {};
+            for (var propName in response) {
+                jObj[propName] = object.unwrapQObject(response[propName]);
+            }
+            return jObj;
         }
 
         var objectId = response.id;