aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-07-19 08:49:53 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2021-07-20 13:30:55 +0200
commit401a5b8a3d4468f97ec20a86055ad785262ceb43 (patch)
tree0b856532cf01fda4004c4eadb9e658220451407c
parenteebebfa665ab4bae01819378f3842bf9384fa7f7 (diff)
PySide6: Fix QMenu.exec_()
The return type conversion was broken. Amends 62acb997f7fce1ae922e3a9995272c78353048b9. Pick-to: 6.1 Fixes: PYSIDE-1625 Change-Id: Ib83c363bee4a3c3de4008fdbf6e175093ef3a872 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r--sources/pyside6/PySide6/glue/qtwidgets.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside6/PySide6/glue/qtwidgets.cpp b/sources/pyside6/PySide6/glue/qtwidgets.cpp
index bd431655e..ca9acb349 100644
--- a/sources/pyside6/PySide6/glue/qtwidgets.cpp
+++ b/sources/pyside6/PySide6/glue/qtwidgets.cpp
@@ -655,7 +655,7 @@ if (PyErr_WarnEx(PyExc_DeprecationWarning,
%BEGIN_ALLOW_THREADS
QAction *cppResult = %CPPSELF.exec();
%END_ALLOW_THREADS
-%PYARG_0 = %CONVERTTOPYTHON[QAction](cppResult);
+%PYARG_0 = %CONVERTTOPYTHON[QAction*](cppResult);
// @snippet qmenu-exec-1
// @snippet qmenu-exec-2
@@ -668,7 +668,7 @@ if (PyErr_WarnEx(PyExc_DeprecationWarning,
%BEGIN_ALLOW_THREADS
QAction *cppResult = %CPPSELF.exec(%1, %2);
%END_ALLOW_THREADS
-%PYARG_0 = %CONVERTTOPYTHON[QAction](cppResult);
+%PYARG_0 = %CONVERTTOPYTHON[QAction*](cppResult);
// @snippet qmenu-exec-2
// @snippet qmenu-exec-3