Teach QML that it is possible to treat custom QObjects as QObject

It is always better to treat a QObject child as QObject then a QVariant.

Change-Id: I4ac069e85232dd4d1411e325bc5b858bd001f9a6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index f90a693265..3d6a13d794 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -1660,9 +1660,13 @@ QV4::ReturnedValue ExecutionEngine::metaTypeToJS(int type, const void *data)
                 return QV4::Encode::null();
             }
             QMetaType mt(type);
-            if (mt.flags() & QMetaType::IsGadget) {
-                Q_ASSERT(mt.metaObject());
-                return QV4::QQmlValueTypeWrapper::create(this, QVariant(type, data), mt.metaObject(), type);
+            if (auto metaObject = mt.metaObject()) {
+                auto flags = mt.flags();
+                if (flags & QMetaType::IsGadget) {
+                    return QV4::QQmlValueTypeWrapper::create(this, QVariant(type, data), metaObject, type);
+                } else if (flags & QMetaType::PointerToQObject) {
+                    return QV4::QObjectWrapper::wrap(this, *reinterpret_cast<QObject* const *>(data));
+                }
             }
             if (QMetaType::hasRegisteredConverterFunction(type, qMetaTypeId<QtMetaTypePrivate::QSequentialIterableImpl>())) {
                 auto v = QVariant(type, data);