1 files changed, 34 insertions, 8 deletions
diff --git a/sources/pyside6/libpyside/pyside.cpp b/sources/pyside6/libpyside/pyside.cpp
index 5c3b0f3af..4769ea86d 100644
--- a/sources/pyside6/libpyside/pyside.cpp
+++ b/sources/pyside6/libpyside/pyside.cpp
@@ -649,18 +649,44 @@ bool registerInternalQtConf()
     return isRegistered;
 }
 
-bool isQObjectDerived(PyTypeObject *pyType, bool raiseError) {
-    static PyTypeObject *qobjectType = Shiboken::Conversions::getPythonTypeObject("QObject*");
+static PyTypeObject *qobjectType()
+{
+    static PyTypeObject * const result = Shiboken::Conversions::getPythonTypeObject("QObject*");
+    return result;
+}
 
-    if (!PyType_IsSubtype(pyType, qobjectType)) {
-        if (raiseError)
-            PyErr_Format(PyExc_TypeError, "A type inherited from %s expected, got %s.",
-                         qobjectType->tp_name, pyType->tp_name);
-        return false;
+bool isQObjectDerived(PyTypeObject *pyType, bool raiseError)
+{
+    const bool result = PyType_IsSubtype(pyType, qobjectType());
+    if (!result && raiseError) {
+        PyErr_Format(PyExc_TypeError, "A type inherited from %s expected, got %s.",
+                     qobjectType()->tp_name, pyType->tp_name);
     }
-    return true;
+    return result;
 }
 
+QObject *convertToQObject(PyObject *object, bool raiseError)
+{
+    if (object == nullptr) {
+        if (raiseError)
+            PyErr_Format(PyExc_TypeError, "None passed for QObject");
+        return nullptr;
+    }
+
+    if (!isQObjectDerived(Py_TYPE(object), raiseError))
+        return nullptr;
+
+    auto *sbkObject = reinterpret_cast<SbkObject*>(object);
+    auto *ptr = Shiboken::Object::cppPointer(sbkObject, qobjectType());
+    if (ptr == nullptr) {
+        if (raiseError) {
+            PyErr_Format(PyExc_TypeError, "Conversion of %s to QObject failed.",
+                         Py_TYPE(object)->tp_name);
+        }
+        return nullptr;
+    }
+    return reinterpret_cast<QObject*>(ptr);
+}
 
 } //namespace PySide