diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-10-07 15:24:45 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-10-08 13:57:38 +0200 |
| commit | 0a2cac41f776e225d617598fd55a942bef913573 (patch) | |
| tree | eff6a40d2fdb6cfc1cc3ecf36f02c6d9e79c8de3 /sources | |
| parent | d3ae7cbd8ee271e2d9ec1d547d2755a3bf2661f6 (diff) | |
PySide6: Fix hang in QQmlApplicationEngine functions with message handler
Add allow-thread.
Fixes: PYSIDE-1681
Change-Id: I624979c5845a3366bcd9d7827ff2c77438ec54f3
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit b8dadf54c3736b52a770d7715c8320a4dd016427)
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside2/PySide2/QtQml/typesystem_qml.xml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml index 0a12d44cf..c237a9d57 100644 --- a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml +++ b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml @@ -116,7 +116,14 @@ <object-type name="QQmlAbstractUrlInterceptor"> <enum-type name="DataType"/> </object-type> - <object-type name="QQmlApplicationEngine"/> + <object-type name="QQmlApplicationEngine"> + <!-- PYSIDE-1681: QQmlApplicationEngine constructor, load() and similar need + allow-thread in case there is a message handler installed + (qInstallMessageHandler) --> + <modify-function signature="^QQmlApplicationEngine\(.*\)$" allow-thread="yes"/> + <modify-function signature="load(const QString &)" allow-thread="yes"/> + <modify-function signature="load(const QUrl &)" allow-thread="yes"/> + </object-type> <object-type name="QQmlComponent"> <enum-type name="CompilationMode"/> <enum-type name="Status"/> |