diff options
| author | Simo Fält <simo.falt@qt.io> | 2023-05-25 11:23:00 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2023-05-25 11:23:00 +0300 |
| commit | e31990ada911989dbcef3d4833f77dd054030e2c (patch) | |
| tree | e08ea7c0808e1468b3c8bbd83fb189a81d8ebeb0 /sources/pyside2/PySide2 | |
| parent | 40fdea15e6545292212ea6c4acc78c3b2975cbd8 (diff) | |
| parent | d135bcccdb609d312993e26b466a853b8d1b3f43 (diff) | |
Merge tag 'v5.15.7-lts' into tqtc/lts-5.15-opensourcev5.15.7-lts-lgpl
Qt For Python Release 5.15.7
Change-Id: I49808098e3ba42be4be438cb3536fc25672c7127
Diffstat (limited to 'sources/pyside2/PySide2')
| -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"/> |