diff options
| author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-11-23 15:17:48 +0100 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-11-27 16:47:12 +0000 |
| commit | 0a70c8485771ae8cc62faaa775b1db2a5dbd95ef (patch) | |
| tree | 73bbfeb66bc907631b9810553e97e004ed17959f /sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | |
| parent | f30e4db5169800c25bf79573f650fc2b08d13046 (diff) | |
Exclude reverse operations from shift hack
An old fix for a QDataStream bug was performing
an additional step related reverse operations,
to make sure we call them if they were implemented
in other classes.
This was intended for shift operations.
Classes like QVector*, QTransform, and others
which include reverse operations like __radd__,
and __rmul__ will include this patch too.
When implementing a class that inherits from these types,
this becomes an infinite loop, which can be solved
applying this patch only for shift operations.
Due to this change, a QMatrix and a shiboken test
needed to be adapted.
Change-Id: Ie399837b6435b2cd058648a15f4d5cdff037ac6b
Fixes: PYSIDE-192
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 6818612cb..e7d1fc76d 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -732,6 +732,12 @@ <insert-template name="qmatrix_map"/> </inject-code> </modify-function> + <modify-function signature="map(const QPoint&)const"> + <modify-argument index="return"> + <replace-type modified-type="QPoint"/> + </modify-argument> + <inject-code file="../glue/qtgui.cpp" snippet="qmatrix-map-point" /> + </modify-function> <modify-function signature="inverted(bool*)const"> <modify-argument index="1"> <remove-argument/> @@ -3100,5 +3106,3 @@ <object-type name="QStyleHints"/> </typesystem> - - |