From cf40e624e603dc468ec585ecddc9fbf1ee0ccddd Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 2 Mar 2022 16:03:11 +0100
Subject: Fix grouped QML properties

Register the meta type using QQmlMetaTypeInterface and use them when
creating properties in the dynamic metaobject builder.

This at least fixes grouped properties when decorators are used. It
does not work when using plain qmlRegisterType() due to an ordering
problem.

Fixes: PYSIDE-1836
Change-Id: I06db020a1ccd169da7a745cc5ef42d38ce35f5f5
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/pyside6/libpyside/dynamicqmetaobject.cpp | 44 ++++++++++++++++++++----
 1 file changed, 37 insertions(+), 7 deletions(-)

(limited to 'sources/pyside6/libpyside/dynamicqmetaobject.cpp')

diff --git a/sources/pyside6/libpyside/dynamicqmetaobject.cpp b/sources/pyside6/libpyside/dynamicqmetaobject.cpp
index 6b412de9a..6f1c9b40a 100644
--- a/sources/pyside6/libpyside/dynamicqmetaobject.cpp
+++ b/sources/pyside6/libpyside/dynamicqmetaobject.cpp
@@ -45,6 +45,7 @@
 #include "pysideproperty_p.h"
 #include "pysideslot_p.h"
 #include "pysideqenum.h"
+#include "pyside_p.h"
 
 #include <shiboken.h>
 
@@ -102,6 +103,10 @@ public:
     const QMetaObject *m_baseObject = nullptr;
     MetaObjects m_cachedMetaObjects;
     bool m_dirty = true;
+
+private:
+    QMetaPropertyBuilder
+        createProperty(PySideProperty *property, const QByteArray &propertyName);
 };
 
 QMetaObjectBuilder *MetaObjectBuilderPrivate::ensureBuilder()
@@ -300,6 +305,35 @@ int MetaObjectBuilderPrivate::getPropertyNotifyId(PySideProperty *property) cons
     return notifyId;
 }
 
+QMetaPropertyBuilder
+    MetaObjectBuilderPrivate::createProperty(PySideProperty *property,
+                                             const QByteArray &propertyName)
+{
+    int propertyNotifyId = getPropertyNotifyId(property);
+    if (propertyNotifyId >= 0)
+        propertyNotifyId -= m_baseObject->methodCount();
+
+    // For QObject-derived Python types, retrieve the meta type registered
+    // by name from the qmlRegisterType, if there is one. This is required for
+    // grouped QML properties to work.
+    auto *builder = ensureBuilder();
+    auto *typeObject = Property::getTypeObject(property);
+    if (typeObject != nullptr && PyType_Check(typeObject)) {
+        auto *pyTypeObject = reinterpret_cast<PyTypeObject *>(typeObject);
+        if (qstrncmp(pyTypeObject->tp_name, "PySide", 6) != 0
+            && PySide::isQObjectDerived(pyTypeObject, false)) {
+            const QByteArray pyType(pyTypeObject->tp_name);
+            const auto metaType = QMetaType::fromName(pyType + '*');
+            if (metaType.isValid()) {
+                return builder->addProperty(propertyName, pyType,
+                                            metaType, propertyNotifyId);
+            }
+        }
+    }
+    return builder->addProperty(propertyName, property->d->typeName,
+                                propertyNotifyId);
+}
+
 int MetaObjectBuilderPrivate::addProperty(const QByteArray &propertyName,
                                           PyObject *data)
 {
@@ -307,13 +341,9 @@ int MetaObjectBuilderPrivate::addProperty(const QByteArray &propertyName,
     if (index != -1)
         return index;
 
-    PySideProperty *property = reinterpret_cast<PySideProperty *>(data);
-    int propertyNotifyId = getPropertyNotifyId(property);
-    if (propertyNotifyId >= 0)
-        propertyNotifyId -= m_baseObject->methodCount();
-    auto newProperty =
-        ensureBuilder()->addProperty(propertyName, property->d->typeName,
-                                     propertyNotifyId);
+    auto *property = reinterpret_cast<PySideProperty *>(data);
+    auto newProperty = createProperty(property, propertyName);
+
     // Adding property attributes
     newProperty.setReadable(PySide::Property::isReadable(property));
     newProperty.setWritable(PySide::Property::isWritable(property));
-- 
cgit v1.2.3