Ticket #51620: patch-no-abort-on-python-errors.diff

qpycore_public_api.cpp

@@ -29 +29 @@
 #include "qpycore_types.h"
 
 
-// A replacement for PyErr_Print() that passes the exception to qFatal().
+// A replacement for PyErr_Print() that passes the exception to qCritical().
 void pyqt5_err_print()
 {
 #if PY_MAJOR_VERSION >= 3
@@ -113 +113 @@
         PyErr_Restore(exception, value, traceback);
         PyErr_Print();
 
-        // This will be passed to qFatal() if we can't get the detailed text.
+        // This will be passed to qCritical() if we can't get the detailed text.
         QByteArray message("Unhandled Python exception");
 
         // Extract the detailed text if it was redirected.
@@ -128 +128 @@
 
             if (text)
             {
-                // Strip the text as qFatal() likes to add a newline.
+                // Strip the text as qCritical() likes to add a newline.
                 PyObject *stripped = PyObject_CallMethod(text,
                         CONST_CAST("strip"), NULL);
 
@@ -186 +186 @@
             Py_DECREF(new_stderr);
         }
 
-        // qFatal() may not call abort.
+        // qCritical() will not call abort.
         Py_BEGIN_ALLOW_THREADS
-        qFatal("%s", message.data());
+        qCritical("%s", message.data());
         Py_END_ALLOW_THREADS
     }
 }