From f6538d29fbd7d216ce00cdc2870c3a1055a24d26 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 1 Feb 2024 13:40:29 +0100 Subject: PySide6: Fix callable invocations - Always make sure to decref the result by using AutoDecref. - Check whether the callback passed to QAbstractOAuth::setModifyParametersFunction() really returns a dict. - Fix bool return of the callback passed to QWebEngineCookieStore::setCookieFilter(). - Some code cosmetics Amends f56329c995d4a708d4169ef52f819b38de1810b0, 535a781d534f4c9d102342a9813528e48c576ffd, 96715550f3d980dc5554c67a3660e94b6a9a3e76, cd394249fc77063a2bd6ba7a7633fdbc10621475, 5fac301e8e5a8d15eaff91d78b5deeeb2204c7b4, Task-number: PYSIDE-1612 Task-number: PYSIDE-1815 Task-number: PYSIDE-1912 Task-number: PYSIDE-2234 Pick-to: 6.6 6.5 Change-Id: I180ed4dfa63fe8ac06a898492244a85ed926c2d6 Reviewed-by: Cristian Maureira-Fredes --- sources/pyside6/PySide6/glue/qtwebenginewidgets.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sources/pyside6/PySide6/glue/qtwebenginewidgets.cpp') diff --git a/sources/pyside6/PySide6/glue/qtwebenginewidgets.cpp b/sources/pyside6/PySide6/glue/qtwebenginewidgets.cpp index 8fdd6b693..af15130a4 100644 --- a/sources/pyside6/PySide6/glue/qtwebenginewidgets.cpp +++ b/sources/pyside6/PySide6/glue/qtwebenginewidgets.cpp @@ -55,8 +55,8 @@ auto callback = [callable](const QString &text) PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QString](text)); Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist)); Py_DECREF(callable); - }; + Py_INCREF(callable); %CPPSELF.%FUNCTION_NAME(callback); // @snippet qwebenginepage-convertto @@ -95,8 +95,8 @@ auto callback = [callable](const QVariant &result) // PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[bool](found)); Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist)); Py_DECREF(callable); - }; + Py_INCREF(callable); %CPPSELF.%FUNCTION_NAME(%1, %2, callback); // @snippet qwebenginepage-runjavascript @@ -114,8 +114,8 @@ auto callback = [callable](const QByteArray &pdf) PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QByteArray](pdf)); Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist)); Py_DECREF(callable); - }; + Py_INCREF(callable); %CPPSELF.%FUNCTION_NAME(callback, %2); // @snippet qwebenginepage-printtopdf -- cgit v1.2.3