aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-05-10 13:33:58 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-05-11 11:41:14 +0000
commitec7327aa4d96fd300875ec2319530022c44796f9 (patch)
tree518c362b088cb45516305dc74b6bc5fad5aa48a4
parent293c5d41a428cf69e18c49854dc9ced47a0c603d (diff)
Revert "PySide6: Fix build broken by mixed flag operators"
This reverts commit 87eb93ea934774bab6e8359ce3c80ae818fa9b7e. The functions are reject (cannot find base operand class) and cause warnings. Change-Id: I6a99405e41720a748dda2c7156e4effccbdab189 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit bc792395139f4312c80f103352acc9a192e6bb52) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/pyside6/PySide6/QtCore/typesystem_core_common.xml8
1 files changed, 0 insertions, 8 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
index 9fe1afc7f..ffb6cef1a 100644
--- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
+++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
@@ -620,14 +620,6 @@
<enum-type name="WindowType" python-type="IntFlag" flags="WindowFlags"/>
<enum-type name="CursorMoveStyle" since="4.8" revision="4800"/>
- <modify-function signature="^operator.\(Qt::AlignmentFlag,Qt::TextFlag\)$"
- remove="all"/>
- <modify-function signature="^operator.\(Qt::TextFlag,Qt::AlignmentFlag\)$"
- remove="all"/>
- <modify-function signature="^operator.\(Qt::TextElideMode,Qt::TextFlag\)$"
- remove="all"/>
- <modify-function signature="^operator.\(Qt::TextFlag,Qt::TextElideMode\)$"
- remove="all"/>
</namespace-type>
<add-function signature="QEnum(PyObject*)" return-type="PyObject*">