diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-11-27 11:16:26 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-11-27 14:40:01 +0100 |
| commit | 3ad6f139ddd792b24e8c15c847f3e5db3eac3bf3 (patch) | |
| tree | b06674883bbb0ebce5d8ee37ce729ecd3392de23 /sources/pyside6 | |
| parent | 7954a7497f413b1b08c102345b68dbe1185084d0 (diff) | |
Fix hang in QSql(Relational)TableModel.select() (PostGres with SSH tunnel)
Complements 3bc23d37737184a89f780d84f431757cd7f725c2
Pick-to: 6.6 6.5 6.2 5.15
Fixes: PYSIDE-1931
Change-Id: I71605d64dbcd3c4d2d38e788d098cfcaccf4e609
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6')
| -rw-r--r-- | sources/pyside6/PySide6/QtSql/typesystem_sql.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sources/pyside6/PySide6/QtSql/typesystem_sql.xml b/sources/pyside6/PySide6/QtSql/typesystem_sql.xml index b77ab0b34..022a5ab09 100644 --- a/sources/pyside6/PySide6/QtSql/typesystem_sql.xml +++ b/sources/pyside6/PySide6/QtSql/typesystem_sql.xml @@ -123,7 +123,7 @@ <include file-name="QSize" location="global"/> </extra-includes> <!-- FIXME: PYSIDE7: Handle setQuery(QSqlQuery&&) in some way? - QTBUG-91766/PYSIDE-2394 --> + QTBUG-91766/PYSIDE-2394. allow-thread for PYSIDE-1931 --> <modify-function signature="setQuery(QSqlQuery)" allow-thread="yes" deprecated="false"/> <modify-function signature="setQuery(QString,QSqlDatabase)" allow-thread="yes"/> @@ -137,6 +137,7 @@ <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> </extra-includes> + <modify-function signature="select()" allow-thread="yes"/> <!-- PYSIDE-1931 --> </object-type> <object-type name="QSqlResult"> <enum-type name="BindingSyntax"/> @@ -169,6 +170,7 @@ <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> </extra-includes> + <modify-function signature="select()" allow-thread="yes"/> <!-- PYSIDE-1931 --> </object-type> <object-type name="QSqlDriverCreatorBase"> <extra-includes> |