From b2b0206844779702320c499f46277c56765a0a9e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 7 Oct 2021 15:24:45 +0200
Subject: 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)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 sources/pyside6/PySide6/QtQml/typesystem_qml.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sources/pyside6/PySide6/QtQml/typesystem_qml.xml b/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
index 9a60eb84b..bd6b2b41d 100644
--- a/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
+++ b/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
@@ -156,10 +156,15 @@
         <enum-type name="DataType"/>
     </object-type>
     <object-type name="QQmlApplicationEngine">
-        <modify-function signature="load(const QString &amp;)">
+    <!-- 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 &amp;)" allow-thread="yes">
             <modify-argument index="1"><replace-type modified-type="PyPathLike"/></modify-argument>
             <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qfile-path-1"/>
         </modify-function>
+        <modify-function signature="load(const QUrl &amp;)" allow-thread="yes"/>
     </object-type>
     <object-type name="QQmlComponent">
         <enum-type name="CompilationMode"/>
-- 
cgit v1.2.3