Merge tag 'v5.15.8-lts' into tqtc/lts-5.15-opensourcev5.15.8-lts-lgpl

Qt For Python Release 5.15.8

Change-Id: Ib92716482ef78eead1859f4f0c980b308a6e5846

3 files changed, 21 insertions, 18 deletions

diff --git a/sources/shiboken2/libshiboken/signature/signature.cpp b/sources/shiboken2/libshiboken/signature/signature.cpp
index 3051c50d5..191af3d9b 100644
--- a/sources/shiboken2/libshiboken/signature/signature.cpp
+++ b/sources/shiboken2/libshiboken/signature/signature.cpp
@@ -471,6 +471,9 @@ static PyObject *adjustFuncName(const char *func_name)
 
     // Run `eval` on the type string to get the object.
     AutoDecRef obtype(PyRun_String(_path, Py_eval_input, ns, ns));
+    if (obtype.isNull())
+        return String::fromCString(func_name);
+
     if (PyModule_Check(obtype.object())) {
         // This is a plain function. Return the unmangled name.
         return String::fromCString(func_name);
diff --git a/sources/shiboken2/libshiboken/signature/signature_extend.cpp b/sources/shiboken2/libshiboken/signature/signature_extend.cpp
index 1490a6003..c1918c492 100644
--- a/sources/shiboken2/libshiboken/signature/signature_extend.cpp
+++ b/sources/shiboken2/libshiboken/signature/signature_extend.cpp
@@ -157,25 +157,25 @@ static PyObject *handle_doc(PyObject *ob, PyObject *old_descr)
     init_module_2();
     AutoDecRef ob_type_mod(GetClassOrModOf(ob));
     const char *name;
-    if (PyModule_Check(ob_type_mod))
-        name = PyModule_GetName(ob_type_mod);
+    if (PyModule_Check(ob_type_mod.object()))
+        name = PyModule_GetName(ob_type_mod.object());
     else
         name = reinterpret_cast<PyTypeObject *>(ob_type_mod.object())->tp_name;
-    if (handle_doc_in_progress || name == nullptr
-        || strncmp(name, "PySide2.", 8) != 0)
-        return PyObject_CallMethodObjArgs(old_descr,
-                                          PyMagicName::get(),
-                                          ob, nullptr);
-    handle_doc_in_progress++;
-    PyObject *res = PyObject_CallFunction(
-                        pyside_globals->make_helptext_func,
-                        const_cast<char *>("(O)"), ob);
-    handle_doc_in_progress--;
-    if (res == nullptr) {
-        PyErr_Print();
-        Py_FatalError("handle_doc did not receive a result");
+    PyObject *res{};
+
+    if (handle_doc_in_progress || name == nullptr || strncmp(name, "PySide2.", 8) != 0) {
+        res = PyObject_CallMethodObjArgs(old_descr, PyMagicName::get(), ob, nullptr);
+    } else {
+        handle_doc_in_progress++;
+        res = PyObject_CallFunction(pyside_globals->make_helptext_func, "(O)", ob);
+        handle_doc_in_progress--;
     }
-    return res;
+
+    if (res)
+        return res;
+
+    PyErr_Clear();
+    Py_RETURN_NONE;
 }
 
 static PyObject *pyside_cf_get___doc__(PyObject *cf)
diff --git a/sources/shiboken2/libshiboken/signature/signature_helper.cpp b/sources/shiboken2/libshiboken/signature/signature_helper.cpp
index 2b360c786..0246ec61d 100644
--- a/sources/shiboken2/libshiboken/signature/signature_helper.cpp
+++ b/sources/shiboken2/libshiboken/signature/signature_helper.cpp
@@ -236,7 +236,7 @@ static PyObject *_build_new_entry(PyObject *new_name, PyObject *value)
     PyObject *new_value = PyDict_Copy(value);
     PyObject *multi = PyDict_GetItem(value, PyName::multi());
     if (multi != nullptr && Py_TYPE(multi) == &PyList_Type) {
-        ssize_t len = PyList_Size(multi);
+        Py_ssize_t len = PyList_Size(multi);
         AutoDecRef list(PyList_New(len));
         if (list.isNull())
             return nullptr;
@@ -314,7 +314,7 @@ PyObject *_address_to_stringlist(PyObject *numkey)
      * When needed in `PySide_BuildSignatureProps`, the strings are
      * finally materialized.
      */
-    ssize_t address = PyNumber_AsSsize_t(numkey, PyExc_ValueError);
+    Py_ssize_t address = PyNumber_AsSsize_t(numkey, PyExc_ValueError);
     if (address == -1 && PyErr_Occurred())
         return nullptr;
     char **sig_strings = reinterpret_cast<char **>(address);