diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-02-25 10:15:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-02-25 10:15:13 +0100 |
| commit | 3809bdf15524e65397447eb7ba62a289c5ef58d4 (patch) | |
| tree | 96fd257f2dba2696a79026ab1101a57496189875 /src | |
| parent | 7fa4cf258af693f0fe61e5006ad83a91c63a45df (diff) | |
| parent | d14c6aa5855ebfb8bb624efd7817bb3cdd4c96e4 (diff) | |
| download | qtwebchannel-3809bdf15524e65397447eb7ba62a289c5ef58d4.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1
Conflicts:
src/webchannel/qmetaobjectpublisher.cpp
Done-With: Arno Rehn <a.rehn@menlosystems.com>
Change-Id: I763a76cf055547c5c5e59511ded51c467d6c7526
Diffstat (limited to 'src')
| -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 cd2d940..c9285b7 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; |