libpyside6: Add a convenience function to convert a PyObject * to a QObject *

Pick-to: 6.2
Task-number: PYSIDE-1709
Change-Id: I137d7fd3ac84f50bb6a799e27e07b7523d943812
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/sources/pyside6/PySide6/QtQml/pysideqmlregistertype.cpp b/sources/pyside6/PySide6/QtQml/pysideqmlregistertype.cpp
index b769a1eb9..f7f1b2375 100644
--- a/sources/pyside6/PySide6/QtQml/pysideqmlregistertype.cpp
+++ b/sources/pyside6/PySide6/QtQml/pysideqmlregistertype.cpp
@@ -295,15 +295,10 @@ int PySide::qmlRegisterSingletonInstance(PyObject *pyObj, const char *uri, int v
     if (!isQObjectDerived(pyObjType, true))
         return -1;
 
-    // Check if the instance object derives from QObject
-    PyTypeObject *typeInstanceObject = instanceObject->ob_type;
-
-    if (!isQObjectDerived(typeInstanceObject, true))
-        return -1;
-
     // Convert the instanceObject (PyObject) into a QObject
-    QObject *instanceQObject = reinterpret_cast<QObject*>(
-            Object::cppPointer(reinterpret_cast<SbkObject*>(instanceObject), qObjectType()));
+    QObject *instanceQObject = PySide::convertToQObject(instanceObject, true);
+    if (instanceQObject == nullptr)
+        return -1;
 
     // Create Singleton Functor to pass the QObject to the Type registration step
     // similarly to the case when we have a callback