diff options
| author | Christian Tismer <tismer@stackless.com> | 2022-10-31 11:28:19 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-10-31 18:12:21 +0000 |
| commit | 4f7b3313434331e56fdfc1040fafbf87887b35c1 (patch) | |
| tree | bc94a3ff5173e9271b0b37c2e45c4d5def328d05 | |
| parent | 93902aac42a417e1c3c5172220ebe81ba94e54fa (diff) | |
PyEnum: Update list of IntEnum to keep compatibility in 6.4
The list of IntEnum overrides has been updated a bit.
We adjust this list accordingly to keep compatibility.
Change-Id: I253ba37328516bf31cbb086f7ed177f8c7b03109
Fixes: PYSIDE-2104
Task-number: PYSIDE-1735
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit f9bdba5135f26ba5862793e84ba495a529a14639)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | sources/pyside6/PySide6/QtGui/typesystem_gui_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/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml index 977bce148..16f36a23d 100644 --- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml +++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml @@ -1855,7 +1855,7 @@ <enum-type name="FindFlag" flags="FindFlags"/> <enum-type name="MarkdownFeature" flags="MarkdownFeatures" since="5.14"/> <enum-type name="MetaInformation"/> - <enum-type name="ResourceType"/> + <enum-type name="ResourceType" python-type="IntEnum"/> <enum-type name="Stacks" since="4.7"/> <modify-function signature="setDocumentLayout(QAbstractTextDocumentLayout*)"> <modify-argument index="1"> diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp index 61d5de7cc..bec5bfa50 100644 --- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp +++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp @@ -424,6 +424,7 @@ static QSet<QString> useIntSet() /* IntEnum */ u"PySide6.QtGui.QFileSystemModel.Roles"_s, /* IntEnum */ u"PySide6.QtGui.QFont.Stretch"_s, /* IntEnum */ u"PySide6.QtGui.QFont.Weight"_s, + /* IntEnum */ u"PySide6.QtGui.QTextDocument.ResourceType"_s, /* IntEnum */ u"PySide6.QtGui.QTextFormat.FormatType"_s, /* IntEnum */ u"PySide6.QtGui.QTextFormat.ObjectTypes"_s, /* IntEnum */ u"PySide6.QtGui.QTextFormat.Property"_s, |