diff options
| author | Christian Tismer <tismer@stackless.com> | 2022-11-02 13:19:22 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-11-03 16:27:03 +0000 |
| commit | 7517b01cc4237074016710140c8390961a8420d9 (patch) | |
| tree | 187d7812eee9869e43ad5ea014831300457f49c7 | |
| parent | de778e6e044cd47d953fa4bb2e33a2c8eefeb8bc (diff) | |
PyEnum: Update list of IntEnum to keep compatibility in 6.4, addition
The list of IntEnum overrides has been updated a bit.
We adjust this list accordingly to keep compatibility.
Task-number: PYSIDE-1735
Change-Id: I20ee82637020d5b26f5acedf5b98b8831e3b7f73
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 7fde6c515363864f0f16edd0f447a61369d09935)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | sources/pyside6/PySide6/QtCore/typesystem_core_common.xml | 2 | ||||
| -rw-r--r-- | sources/shiboken6/generator/shiboken/cppgenerator.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index 3a716a941..3af5cd6a4 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -563,7 +563,7 @@ <enum-type name="EventPriority"/> <enum-type name="FillRule"/> <enum-type name="FindChildOption" flags="FindChildOptions"/> - <enum-type name="FocusPolicy"/> + <enum-type name="FocusPolicy" python-type="IntFlag"/> <enum-type name="FocusReason"/> <enum-type name="GestureFlag" flags="GestureFlags" since="4.6"/> <enum-type name="GestureState" since="4.6"/> diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp index c9a8fbfb1..44df49a57 100644 --- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp +++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp @@ -416,6 +416,7 @@ static QSet<QString> useIntSet() // note: "QUrl::UrlFormattingOption" is set as IntFlag without flags /* IntFlag */ u"PySide6.QtCore.QUrl.UrlFormattingOption"_s, /* IntFlag */ u"PySide6.QtCore.Qt.AlignmentFlag"_s, + /* IntFlag */ u"PySide6.QtCore.Qt.FocusPolicy"_s, /* IntEnum */ u"PySide6.QtCore.Qt.GestureType"_s, /* IntEnum */ u"PySide6.QtCore.Qt.ItemDataRole"_s, /* IntEnum */ u"PySide6.QtCore.Qt.Key"_s, |