aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-05-18 15:56:17 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-05-18 16:55:45 +0000
commita6c0db69c9408c08a01669db6353fb7fd95b7f23 (patch)
treeb2eed6c296f650c6471e7d7d9a1f4ce32e5029c7
parentbb1887bcc6692f7dfece87fe3df42226d4b83008 (diff)
PySide6/QtGui: Fix crashes in functions returning internally owned classes by pointer
Indicate Default ownership, for QClipboard.mimeData(), QTextCursor.currentList(), QTextCursor.currentTable(), fixing: RuntimeError: Internal C++ object (PySide6.QtCore.QMimeData) already deleted. RuntimeError: Internal C++ object (PySide6.QtGui.QTextList) already deleted. [ChangeLog][PySide6] Crashes in QClipboard.mimeData(), QTextCursor.currentList() and QTextCursor.currentTable() have been fixed. Change-Id: I1e4f55856bce8bf951edd8579331f0242e904ae6 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 8cd50636102be2e1178c8c602a3e374891398e3e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml15
1 files changed, 15 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
index 66d7780ba..b61660b7a 100644
--- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
@@ -614,6 +614,16 @@
<define-ownership class="target" owner="default"/>
</modify-argument>
</modify-function>
+ <modify-function signature="currentTable()const">
+ <modify-argument index="return">
+ <define-ownership class="target" owner="default"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="currentList()const">
+ <modify-argument index="return">
+ <define-ownership class="target" owner="default"/>
+ </modify-argument>
+ </modify-function>
<modify-function signature="insertTable(int,int,const QTextTableFormat &amp;)">
<modify-argument index="return">
<define-ownership class="target" owner="default"/>
@@ -1673,6 +1683,11 @@
</modify-argument>
<inject-code class="target" position="end" file="../glue/qtgui.cpp" snippet="qclipboard-text"/>
</modify-function>
+ <modify-function signature="mimeData(QClipboard::Mode)const">
+ <modify-argument index="return">
+ <define-ownership class="target" owner="default"/>
+ </modify-argument>
+ </modify-function>
</object-type>
<object-type name="QPaintEngineState">
<extra-includes>