diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-26 03:01:46 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-26 03:01:46 +0100 |
| commit | 8b701450aeceb878784879eaf65dc42d5befd3a5 (patch) | |
| tree | 54f17793083bfc150e515c0e2d0b15734e33934f /src/webchannel | |
| parent | f51cdfcec3630c8aa76e0459049ac54a71276a0c (diff) | |
| parent | 3809bdf15524e65397447eb7ba62a289c5ef58d4 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ife028425ea8c14d972c2df59071a9333352af7d1
Diffstat (limited to 'src/webchannel')
| -rw-r--r-- | src/webchannel/qmetaobjectpublisher.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp index f1ccbe9..3c96126 100644 --- a/src/webchannel/qmetaobjectpublisher.cpp +++ b/src/webchannel/qmetaobjectpublisher.cpp @@ -491,6 +491,9 @@ QObject *QMetaObjectPublisher::unwrapObject(const QString &objectId) const ObjectInfo objectInfo = wrappedObjects.value(objectId); if (objectInfo.object && !objectInfo.classinfo.isEmpty()) return objectInfo.object; + QObject *object = registeredObjects.value(objectId); + if (object) + return object; } qWarning() << "No wrapped object" << objectId; |