sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

QVariant.Type, Qt.ItemFlag and Qt.CheckState need to be int compatible

Browse Source 
For reasons(?) these aren't IntEnums/IntFlags on PyQt6, but we need
them to be int compatible for compatibility with PyQt5 code
This commit is contained in:
Nyall Dawson 2024-02-15 09:51:46 +10:00 committed by Julien Cabieces
parent 01fc784cb6
commit ec1b4f822a
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/test_blocklist_qt6.txt
View File

@ -41,13 +41,11 @@ PyQgsPythonProvider
PyQgsAnnotation
PyQgsAuthenticationSystem
PyQgsBlockingProcess
PyQgsBookmarkModel
PyQgsCodeEditor
PyQgsDelimitedTextProvider
PyQgsEditWidgets
PyQgsElevationProfileCanvas
PyQgsProject
PyQgsFieldModel
PyQgsFloatingWidget
PyQgsJsonUtils
PyQgsLayoutHtml

14
python/PyQt/PyQt/QtCore.py.in
View File

@ -132,6 +132,20 @@ if (QT_VERSION >= 0x060000):
QVariant.SizePolicy = QMetaType.Type.QSizePolicy
QVariant.UserType = QMetaType.Type.User
from enum import Enum
def _force_int(v): return int(v.value) if isinstance(v, Enum) else v
QMetaType.Type.__int__ = _force_int
QMetaType.Type.__eq__ = lambda t1, t2: _force_int(t1) == _force_int(t2)
# These types aren't IntEnums or IntFlags, so patch that back in
Qt.ItemFlag.__int__ = _force_int
Qt.ItemFlag.__eq__ = lambda t1, t2: _force_int(t1) == _force_int(t2)
Qt.CheckState.__int__ = _force_int
Qt.CheckState.__eq__ = lambda t1, t2: _force_int(t1) == _force_int(t2)
# patch back in Qt flags removed in PyQt
QAbstractItemModel.CheckIndexOptions = lambda flags=0: QAbstractItemModel.CheckIndexOption(flags)