aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-06-24 08:04:44 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-06-24 14:44:50 +0000
commiteb845eb7054666fdc60b8bb49e794f7c65bf99c6 (patch)
treee979c5bd8b845b9084d983c21e6ceadd1f060ec7
parentf8f80970ac0ff796ed166667f93cf4742262587b (diff)
Fix returning flags from QAbstractTableModel and other models
Move the function modification from QAbstractListModel to QAbstractItemModel. Amends 20eb4f94c637d20461f1fef16942841803ada909. Fixes: PYSIDE-1974 Task-number: PYSIDE-1930 Change-Id: I9adedf8340a7f0999c42147e8fd290444642abcc Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit f8e945097c4639df5d1263dbca81e2c4fcc371b5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/pyside6/PySide6/QtCore/typesystem_core_common.xml5
1 files changed, 2 insertions, 3 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
index 01620d671..d2a2e3547 100644
--- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
+++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
@@ -1546,6 +1546,8 @@
<modify-argument index="return">
<define-ownership class="native" owner="c++"/>
</modify-argument>
+ <inject-code class="native" position="end" file="../glue/qtcore.cpp"
+ snippet="qabstractitemmodel_data"/>
</modify-function>
<modify-function signature="headerData(int,Qt::Orientation,int)const">
<inject-code class="native" position="end" file="../glue/qtcore.cpp"
@@ -1779,9 +1781,6 @@
<include file-name="QStringList" location="global"/>
<include file-name="QSize" location="global"/>
</extra-includes>
- <modify-function signature="data(const QModelIndex&amp;,int)const">
- <inject-code class="native" position="end" file="../glue/qtcore.cpp" snippet="qabstractitemmodel_data"/>
- </modify-function>
</object-type>
<value-type name="QUrlQuery" since="5.0"/>