aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-05-23 11:51:49 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-05-23 15:47:57 +0000
commit963121d36cc3d49abd2b19246d838d701a8e5b0b (patch)
treea5dfa8e7f321855fd65e2e5540f66a58a8bafbe6 /sources/pyside6
parent1cc547a413207677584e87d5851d8a4c3d35b6fa (diff)
Fix a crash in QTextBlock.layout()
Prevent the return value heuristics from setting a parent relationship. Fixes: PYSIDE-1939 Change-Id: I7b8b4080f4c0c288439140c44fb9c2b896af2907 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 0e62c4db50472f8b581022c86a6be651158d0cd0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'sources/pyside6')
-rw-r--r--sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
index 18084c6b0..16096ba94 100644
--- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
@@ -504,6 +504,11 @@
</modify-argument>
<inject-code class="target" position="end" file="../glue/qtgui.cpp" snippet="qtextblock-userdata"/>
</modify-function>
+ <modify-function signature="layout()const"> <!-- Suppress return value heuristics -->
+ <modify-argument index="return">
+ <define-ownership class="target" owner="default"/>
+ </modify-argument>
+ </modify-function>
</value-type>
<value-type name="QTextBlockFormat">
<enum-type name="LineHeightTypes" since="4.8" revision="4800"/>