diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-08-23 09:00:03 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-24 10:58:43 +0000 |
| commit | 16c25a20cf03b4f92aef24b2ed79350ab9065794 (patch) | |
| tree | 8b648184faf2363b51c090103ff814080f56769c | |
| parent | c1934fb0662d372034d2d0f3bed414401c1580fe (diff) | |
Fix blocking threads in static functions of QMessageBox
Add the allow-thread attribute for the compatibility overloads
along with a fixme comment.
Fixes: PYSIDE-2034
Task-number: PYSIDE-803
Change-Id: Id89767c8fdd14cc450ae131ead873d1afdc94b8f
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 5c37a8c9ffea848f4115e3b89f50bddc4ea4a6de)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml index 85b0443d9..384b03b27 100644 --- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml @@ -2295,10 +2295,19 @@ <include file-name="QPixmap" location="global"/> </extra-includes> + <!-- FIXME PYSIDE-7: Remove deprecated overloads --> <modify-function signature="critical(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="critical(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="information(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="information(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="question(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="question(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="warning(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="warning(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="QMessageBox(const QString&,const QString&,QMessageBox::Icon,int,int,int,QWidget*,QFlags<Qt::WindowType>)" remove="all"/> <modify-function signature="critical(QWidget*,const QString&,const QString&,int,int,int)" remove="all"/> <modify-function signature="critical(QWidget*,const QString&,const QString&,const QString&,const QString&,const QString&,int,int)" remove="all"/> |