From 6766582f7b52de38d4cae197766099ae2242ae3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lutz=20Sch=C3=B6nemann?= Date: Mon, 18 Aug 2014 18:11:34 +0200 Subject: Fixing property update for wrapped objects Returned QObject pointer got wrapped correctly but a wrong QJsonObject was given to initializePropertyUpdates() method. Change-Id: I157b862ba2a90e87c295beb3c02fff932aac83c6 Reviewed-by: Milian Wolff --- src/webchannel/qmetaobjectpublisher.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp index eb2fdbd..a6e3e65 100644 --- a/src/webchannel/qmetaobjectpublisher.cpp +++ b/src/webchannel/qmetaobjectpublisher.cpp @@ -441,15 +441,16 @@ QJsonValue QMetaObjectPublisher::wrapResult(const QVariant &result) const QString &id = QUuid::createUuid().toString(); Q_ASSERT(!registeredObjectIds.contains(object)); + QJsonObject info = classInfoForObject(object); objectInfo[KEY_QOBJECT] = true; objectInfo[KEY_ID] = id; - objectInfo[KEY_DATA] = classInfoForObject(object); + objectInfo[KEY_DATA] = info; registeredObjectIds[object] = id; registeredObjects[id] = object; wrappedObjects.insert(object, objectInfo); - initializePropertyUpdates(object, objectInfo); + initializePropertyUpdates(object, info); return objectInfo; } -- cgit v1.2.1