diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-03-18 22:43:17 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-03-19 14:26:06 +0100 |
| commit | 87eb93ea934774bab6e8359ce3c80ae818fa9b7e (patch) | |
| tree | b88eb78077462e366ddb2a7a3eb39cd44aec9f42 | |
| parent | e1710b0c0fddf5d7dc452d277243bdedc2a99e19 (diff) | |
PySide6: Fix build broken by mixed flag operators
Change qtbase/e7fd9a9f4ab1fcc017174d6d7760c731857b89fc introduced
some mixed flag operators which cause compile errors. Remove them.
Task-number: QTBUG-99948
Change-Id: Ie3dde185e68bd972bc15eafac2875ada488dec5d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/pyside6/PySide6/QtCore/typesystem_core_common.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index e2a79c1aa..06d922851 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -615,6 +615,14 @@ <enum-type name="WindowType" 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*"> |