diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2025-01-28 14:51:21 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2025-02-06 11:26:31 +0100 |
| commit | 8f768500107b0fae5957e5f8ee007f5798db2fc3 (patch) | |
| tree | 7e2018ecef64b7a40182c7aadfc69f23c5ba4915 /sources/pyside6/PySide6/QtWidgets | |
| parent | 8f452f3d4d863f77f2b5054a4f17c25034b1b339 (diff) | |
shiboken6: Consider all base classes when finding a modification
This enables removing a duplicate modification for
QGraphicsWidget::getContentsMargins() which is inherited from class
QGraphicsLayout, QGraphicsLayoutItem (2nd base class) and activates
other base modifications for QGraphicsObject-derived classes.
Also add a flag indicating whether the modification is inherited
from a base class or directly specified for later use
in size reduction.
[ChangeLog][shiboken6] Modifications from base classes in multiple
inheritance will now be correctly applied.
Task-number: PYSIDE-2701
Change-Id: I190764a673fb6b7ad44aea5ed90ff64c57eda324
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6/QtWidgets')
| -rw-r--r-- | sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml index 6c6bf7f77..08cd812e9 100644 --- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml @@ -3089,33 +3089,6 @@ </modify-function> </object-type> <object-type name="QGraphicsLayout"> - <modify-function signature="getContentsMargins(qreal*,qreal*,qreal*,qreal*)const"> - <modify-argument index="0"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*"> - <replace from="$TYPE" to="qreal"/> - </insert-template> - </inject-code> - <inject-code class="native" position="end"> - <insert-template name="fix_native_return_number*,number*,number*,number*"> - <replace from="$TYPE" to="qreal"/> - </insert-template> - </inject-code> - </modify-function> <modify-function signature="widgetEvent(QEvent*)"> <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> @@ -3204,29 +3177,6 @@ </object-type> <!-- a QObject so main-thread delete redundant --> <object-type name="QGraphicsWidget"> - <modify-function signature="getContentsMargins(qreal*,qreal*,qreal*,qreal*)const"> - <modify-argument index="return"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - </modify-argument> - - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*"> - <replace from="$TYPE" to="qreal"/> - </insert-template> - </inject-code> - </modify-function> <modify-function signature="getWindowFrameMargins(qreal*,qreal*,qreal*,qreal*)const"> <modify-argument index="return"> <replace-type modified-type="PyObject"/> |