PySide6/Tests: Use fully qualified enumerations

As a drive-by fix flake errors.

Pick-to: 6.8
Task-number: PYSIDE-1735
Change-Id: I9829b011fee78fc8edd1aefdd3066ae89e63644b
Reviewed-by: Shyamnath Premnadh <[email protected]>

22 files changed, 111 insertions, 97 deletions

diff --git a/sources/pyside6/tests/QtGui/bug_493.py b/sources/pyside6/tests/QtGui/bug_493.py
index faf265755..9f94042ad 100644
--- a/sources/pyside6/tests/QtGui/bug_493.py
+++ b/sources/pyside6/tests/QtGui/bug_493.py
@@ -20,10 +20,10 @@ class TestBug493(unittest.TestCase):
     def testIt(self):
         # We need a qapp otherwise Qt will crash when trying to detect the
         # current platform
-        app = QGuiApplication([])
-        ev1 = QKeyEvent(QEvent.KeyRelease, Qt.Key_Delete, Qt.NoModifier)
-        ev2 = QKeyEvent(QEvent.KeyRelease, Qt.Key_Copy, Qt.NoModifier)
-        ks = QKeySequence.Delete
+        app = QGuiApplication([])  # noqa: F841
+        ev1 = QKeyEvent(QEvent.Type.KeyRelease, Qt.Key.Key_Delete, Qt.KeyboardModifier.NoModifier)
+        ev2 = QKeyEvent(QEvent.Type.KeyRelease, Qt.Key.Key_Copy, Qt.KeyboardModifier.NoModifier)
+        ks = QKeySequence.StandardKey.Delete
 
         self.assertTrue(ev1.matches(ks))
         self.assertFalse(ev2.matches(ks))
diff --git a/sources/pyside6/tests/QtGui/bug_617.py b/sources/pyside6/tests/QtGui/bug_617.py
index fb793e6ee..505e068dc 100644
--- a/sources/pyside6/tests/QtGui/bug_617.py
+++ b/sources/pyside6/tests/QtGui/bug_617.py
@@ -24,7 +24,7 @@ class Bug617(unittest.TestCase):
     def testRepr(self):
         c = QColor.fromRgb(1, 2, 3, 4)
         s = c.spec()
-        self.assertEqual(repr(s), repr(QColor.Rgb))
+        self.assertEqual(repr(s), repr(QColor.Spec.Rgb))
 
     def testOutOfBounds(self):
         e = MyEvent()
diff --git a/sources/pyside6/tests/QtGui/bug_740.py b/sources/pyside6/tests/QtGui/bug_740.py
index c1b41c2ab..e5b80cbf8 100644
--- a/sources/pyside6/tests/QtGui/bug_740.py
+++ b/sources/pyside6/tests/QtGui/bug_740.py
@@ -18,8 +18,9 @@ from PySide6.QtGui import QBitmap, QImage
 
 class TestQBitmap(UsesQApplication):
     def testFromDataMethod(self):
-        dataBits = bytes('\x38\x28\x38\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\xfe\xfe\x7c\x7c\x38\x38\x10\x10', "UTF-8")
-        bim = QBitmap.fromData(QSize(8, 48), dataBits, QImage.Format_Mono)  # missing function
+        dataBits = bytes('\x38\x28\x38\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\x10\xfe\xfe\x7c\x7c\x38\x38\x10\x10', "UTF-8")  # noqa: E501
+        # missing function
+        bim = QBitmap.fromData(QSize(8, 48), dataBits, QImage.Format.Format_Mono)  # noqa: F841
 
 
 if __name__ == '__main__':
diff --git a/sources/pyside6/tests/QtGui/event_filter_test.py b/sources/pyside6/tests/QtGui/event_filter_test.py
index ff894dbd0..57f137fdf 100644
--- a/sources/pyside6/tests/QtGui/event_filter_test.py
+++ b/sources/pyside6/tests/QtGui/event_filter_test.py
@@ -18,7 +18,7 @@ from PySide6.QtGui import QWindow
 
 class MyFilter(QObject):
     def eventFilter(self, obj, event):
-        if event.type() == QEvent.KeyPress:
+        if event.type() == QEvent.Type.KeyPress:
             pass
         return QObject.eventFilter(self, obj, event)
 
diff --git a/sources/pyside6/tests/QtGui/float_to_int_implicit_conversion_test.py b/sources/pyside6/tests/QtGui/float_to_int_implicit_conversion_test.py
index e26d43254..0ed7fe402 100644
--- a/sources/pyside6/tests/QtGui/float_to_int_implicit_conversion_test.py
+++ b/sources/pyside6/tests/QtGui/float_to_int_implicit_conversion_test.py
@@ -26,7 +26,7 @@ class SetPixelFloat(UsesQApplication):
         # Acquire resources
         super(SetPixelFloat, self).setUp()
         self.color = qRgb(255, 0, 0)
-        self.image = QImage(200, 200, QImage.Format_RGB32)
+        self.image = QImage(200, 200, QImage.Format.Format_RGB32)
 
     def tearDown(self):
         # Release resources
diff --git a/sources/pyside6/tests/QtGui/qbrush_test.py b/sources/pyside6/tests/QtGui/qbrush_test.py
index 997ffc152..15c575d30 100644
--- a/sources/pyside6/tests/QtGui/qbrush_test.py
+++ b/sources/pyside6/tests/QtGui/qbrush_test.py
@@ -28,8 +28,8 @@ class Constructor(UsesQApplication):
         obj = QBrush(color)
         self.assertEqual(obj.color(), color)
 
-        obj = QBrush(Qt.blue)
-        self.assertEqual(obj.color(), Qt.blue)
+        obj = QBrush(Qt.GlobalColor.blue)
+        self.assertEqual(obj.color(), Qt.GlobalColor.blue)
 
     def testGradient(self):
         """Test type discovery on class hierarchies with non-virtual
diff --git a/sources/pyside6/tests/QtGui/qcolor_test.py b/sources/pyside6/tests/QtGui/qcolor_test.py
index ba9cc5cb8..b1576b6f3 100644
--- a/sources/pyside6/tests/QtGui/qcolor_test.py
+++ b/sources/pyside6/tests/QtGui/qcolor_test.py
@@ -64,7 +64,7 @@ class QColorEqualGlobalColor(unittest.TestCase):
 
     def testEqualGlobalColor(self):
         '''QColor == Qt::GlobalColor'''
-        self.assertEqual(QColor(255, 0, 0), Qt.red)
+        self.assertEqual(QColor(255, 0, 0), Qt.GlobalColor.red)
 
 
 class QColorCopy(unittest.TestCase):
diff --git a/sources/pyside6/tests/QtGui/qdatastream_gui_operators_test.py b/sources/pyside6/tests/QtGui/qdatastream_gui_operators_test.py
index 8de7160e9..9fea56203 100644
--- a/sources/pyside6/tests/QtGui/qdatastream_gui_operators_test.py
+++ b/sources/pyside6/tests/QtGui/qdatastream_gui_operators_test.py
@@ -25,11 +25,11 @@ class QPixmapQDatastream(UsesQApplication):
         self.source_pixmap = QPixmap(100, 100)
         # PYSIDE-1533: Use Qt.transparent to force Format_ARGB32_Premultiplied
         # when converting to QImage in any case.
-        self.source_pixmap.fill(Qt.transparent)
+        self.source_pixmap.fill(Qt.GlobalColor.transparent)
         self.output_pixmap = QPixmap()
         self.buffer = QByteArray()
-        self.read_stream = QDataStream(self.buffer, QIODevice.ReadOnly)
-        self.write_stream = QDataStream(self.buffer, QIODevice.WriteOnly)
+        self.read_stream = QDataStream(self.buffer, QIODevice.OpenModeFlag.ReadOnly)
+        self.write_stream = QDataStream(self.buffer, QIODevice.OpenModeFlag.WriteOnly)
 
     def testStream(self):
         self.write_stream << self.source_pixmap
@@ -38,7 +38,7 @@ class QPixmapQDatastream(UsesQApplication):
 
         image = self.output_pixmap.toImage()
         pixel = image.pixel(10, 10)
-        self.assertEqual(pixel, QColor(Qt.transparent).rgba())
+        self.assertEqual(pixel, QColor(Qt.GlobalColor.transparent).rgba())
         self.assertEqual(self.source_pixmap.toImage(), image)
 
 
diff --git a/sources/pyside6/tests/QtGui/qfontmetrics_test.py b/sources/pyside6/tests/QtGui/qfontmetrics_test.py
index 257a3dae3..0de7fe830 100644
--- a/sources/pyside6/tests/QtGui/qfontmetrics_test.py
+++ b/sources/pyside6/tests/QtGui/qfontmetrics_test.py
@@ -42,49 +42,52 @@ class BoundingRectTest(QFontMetricsTest):
     def testIntDefault(self):
         '''QFontMetrics.boundingRect(int, int, int, int, ...) - default args'''
         rect = self.metrics.boundingRect(0, 0, 0, 0,
-                                         Qt.TextExpandTabs | Qt.AlignLeft,
-                                         'PySide by INdT')
+                                         Qt.TextFlag.TextExpandTabs | Qt.AlignmentFlag.AlignLeft,
+                                         'PySide by Qt Company')
         self.assertTrue(isinstance(rect, QRect))
 
     def testIntWithArg(self):
         '''QFontMetrics.boundingRect(int, int, int, int, ...) - single arg'''
         rect = self.metrics.boundingRect(0, 0, 0, 0,
-                                         Qt.TextExpandTabs | Qt.AlignLeft,
-                                         'PySide by INdT', 2)
+                                         Qt.TextFlag.TextExpandTabs | Qt.AlignmentFlag.AlignLeft,
+                                         'PySide by Qt Company', 2)
         self.assertTrue(isinstance(rect, QRect))
 
     def testIntWithFull(self):
         '''QFontMetrics.boundingRect(int, int, int, int, ...) - all argss'''
         rect = self.metrics.boundingRect(0, 0, 0, 0,
-                                         Qt.TextExpandTabs | Qt.AlignLeft,
-                                         'PySide by INdT', 20, [1, 2, 3, 4, 5])
+                                         Qt.TextFlag.TextExpandTabs | Qt.AlignmentFlag.AlignLeft,
+                                         'PySide by Qt Company', 20, [1, 2, 3, 4, 5])
         self.assertTrue(isinstance(rect, QRect))
 
     def testIntTypeError(self):
         '''QFontMetrics.boundingRect(int, int, int, int, ...) - type error'''
         self.assertRaises(TypeError, self.metrics.boundingRect, 0, 0, 0, 0,
-                                         Qt.TextExpandTabs | Qt.AlignLeft,
-                                         'PySide by INdT', 20, ['aaaa', 'ase'])
+                          Qt.TextFlag.TextExpandTabs | Qt.AlignmentFlag.AlignLeft,
+                          'PySide by Qt Company', 20, ['aaaa', 'ase'])
 
     def testQRectDefault(self):
         '''QFontMetrics.boundingRect(QRect, ...) - default args'''
         arg = QRect(0, 0, 100, 200)
-        rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
-                                         'PySide by INdT')
+        rect = self.metrics.boundingRect(arg,
+                                         Qt.TextFlag.TextExpandTabs | Qt.AlignmentFlag.AlignLeft,
+                                         'PySide by Qt Company')
         self.assertTrue(isinstance(rect, QRect))
 
     def testQRectWithArg(self):
         '''QFontMetrics.boundingRect(QRect, ...) - only tabstops'''
         arg = QRect(0, 0, 100, 200)
-        rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
-                                         'PySide by INdT', 2)
+        rect = self.metrics.boundingRect(arg,
+                                         Qt.TextFlag.TextExpandTabs | Qt.AlignmentFlag.AlignLeft,
+                                         'PySide by Qt Company', 2)
         self.assertTrue(isinstance(rect, QRect))
 
     def testQRectWithFull(self):
         '''QFontMetrics.boundingRect(QRect, ...) - all arguments'''
         arg = QRect(0, 0, 100, 200)
-        rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
-                                         'PySide by INdT', 20,
+        rect = self.metrics.boundingRect(arg,
+                                         Qt.TextFlag.TextExpandTabs | Qt.AlignmentFlag.AlignLeft,
+                                         'PySide by Qt Company', 20,
                                          [1, 2, 3, 4, 5])
         self.assertTrue(isinstance(rect, QRect))
 
@@ -92,8 +95,8 @@ class BoundingRectTest(QFontMetricsTest):
         '''QFontMetrics.boundingRect(QRect, ...) - type error'''
         arg = QRect(0, 0, 100, 200)
         self.assertRaises(TypeError, self.metrics.boundingRect, arg,
-                          Qt.TextExpandTabs | Qt.AlignLeft,
-                          'PySide by INdT', 20, ['aaaa', 'ase'])
+                          Qt.TextFlag.TextExpandTabs | Qt.AlignmentFlag.AlignLeft,
+                          'PySide by Qt Company', 20, ['aaaa', 'ase'])
 
 
 class SizeTest(QFontMetricsTest):
@@ -101,27 +104,27 @@ class SizeTest(QFontMetricsTest):
 
     def testDefault(self):
         '''QFontMetrics.size - default arguments'''
-        size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
-                                 'PySide by INdT')
+        size = self.metrics.size(Qt.TextFlag.TextExpandTabs | Qt.TextFlag.TextSingleLine,
+                                 'PySide by Qt Company')
         self.assertTrue(isinstance(size, QSize))
 
     def testWithTabStops(self):
         '''QFontMetrics.size - only tabstops'''
-        size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
-                                 'PySide by INdT', 2)
+        size = self.metrics.size(Qt.TextFlag.TextExpandTabs | Qt.TextFlag.TextSingleLine,
+                                 'PySide by Qt Company', 2)
         self.assertTrue(isinstance(size, QSize))
 
     def testFull(self):
         '''QFontMetrics.size - all arguments'''
-        size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
-                                 'PySide by INdT', 2, [1, 2, 3, 4])
+        size = self.metrics.size(Qt.TextFlag.TextExpandTabs | Qt.TextFlag.TextSingleLine,
+                                 'PySide by Qt Company', 2, [1, 2, 3, 4])
         self.assertTrue(isinstance(size, QSize))
 
     def testTypeError(self):
         '''QFontMetrics.size - type error'''
         self.assertRaises(TypeError, self.metrics.size,
-                                         Qt.TextExpandTabs | Qt.AlignLeft,
-                                         'PySide by INdT', 20, ['aaaa', 'ase'])
+                          Qt.TextFlag.TextExpandTabs | Qt.AlignmentFlag.AlignLeft,
+                          'PySide by Qt Company', 20, ['aaaa', 'ase'])
 
 
 class QFontMetricsFTest(UsesQApplication):
@@ -146,22 +149,25 @@ class FBoundingRectTest(QFontMetricsFTest):
     def testQRectDefault(self):
         '''QFontMetricsF.boundingRect(QRectF, ...) - default args'''
         arg = QRectF(0, 0, 100, 200)
-        rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
-                                         'PySide by INdT')
+        rect = self.metrics.boundingRect(arg,
+                                         Qt.TextFlag.TextExpandTabs | Qt.AlignmentFlag.AlignLeft,
+                                         'PySide by Qt Company')
         self.assertTrue(isinstance(rect, QRectF))
 
     def testQRectWithArg(self):
         '''QFontMetricsF.boundingRect(QRectF, ...) - only tabstops'''
         arg = QRectF(0, 0, 100, 200)
-        rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
-                                         'PySide by INdT', 2)
+        rect = self.metrics.boundingRect(arg,
+                                         Qt.TextFlag.TextExpandTabs | Qt.AlignmentFlag.AlignLeft,
+                                         'PySide by Qt Company', 2)
         self.assertTrue(isinstance(rect, QRectF))
 
     def testQRectWithFull(self):
         '''QFontMetricsF.boundingRect(QRectF, ...) - all arguments'''
         arg = QRectF(0, 0, 100, 200)
-        rect = self.metrics.boundingRect(arg, Qt.TextExpandTabs | Qt.AlignLeft,
-                                         'PySide by INdT', 20,
+        rect = self.metrics.boundingRect(arg,
+                                         Qt.TextFlag.TextExpandTabs | Qt.AlignmentFlag.AlignLeft,
+                                         'PySide by Qt Company', 20,
                                          [1, 2, 3, 4, 5])
         self.assertTrue(isinstance(rect, QRectF))
 
@@ -169,8 +175,8 @@ class FBoundingRectTest(QFontMetricsFTest):
         '''QFontMetricsF.boundingRect(QRectF, ...) - type error'''
         arg = QRectF(0, 0, 100, 200)
         self.assertRaises(TypeError, self.metrics.boundingRect, arg,
-                                         Qt.TextExpandTabs | Qt.AlignLeft,
-                                         'PySide by INdT', 20, ['aaaa', 'ase'])
+                          Qt.TextFlag.TextExpandTabs | Qt.AlignmentFlag.AlignLeft,
+                          'PySide by Qt Company', 20, ['aaaa', 'ase'])
 
 
 class FSizeTest(QFontMetricsFTest):
@@ -178,27 +184,27 @@ class FSizeTest(QFontMetricsFTest):
 
     def testDefault(self):
         '''QFontMetricsF.size - default arguments'''
-        size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
-                                 'PySide by INdT')
+        size = self.metrics.size(Qt.TextFlag.TextExpandTabs | Qt.TextFlag.TextSingleLine,
+                                 'PySide by Qt Company')
         self.assertTrue(isinstance(size, QSizeF))
 
     def testWithTabStops(self):
         '''QFontMetricsF.size - only tabstops'''
-        size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
-                                 'PySide by INdT', 2)
+        size = self.metrics.size(Qt.TextFlag.TextExpandTabs | Qt.TextFlag.TextSingleLine,
+                                 'PySide by Qt Company', 2)
         self.assertTrue(isinstance(size, QSizeF))
 
     def testFull(self):
         '''QFontMetricsF.size - all arguments'''
-        size = self.metrics.size(Qt.TextExpandTabs | Qt.TextSingleLine,
-                                 'PySide by INdT', 2, [1, 2, 3, 4])
+        size = self.metrics.size(Qt.TextFlag.TextExpandTabs | Qt.TextFlag.TextSingleLine,
+                                 'PySide by Qt Company', 2, [1, 2, 3, 4])
         self.assertTrue(isinstance(size, QSizeF))
 
     def testTypeError(self):
         '''QFontMetricsF.size - type error'''
         self.assertRaises(TypeError, self.metrics.size,
-                          Qt.TextExpandTabs | Qt.AlignLeft,
-                          'PySide by INdT', 20, ['aaaa', 'ase'])
+                          Qt.TextFlag.TextExpandTabs | Qt.AlignmentFlag.AlignLeft,
+                          'PySide by Qt Company', 20, ['aaaa', 'ase'])
 
 
 class QCharTest(QFontMetricsFTest):
diff --git a/sources/pyside6/tests/QtGui/qimage_test.py b/sources/pyside6/tests/QtGui/qimage_test.py
index c87cfcf4b..61fffc124 100644
--- a/sources/pyside6/tests/QtGui/qimage_test.py
+++ b/sources/pyside6/tests/QtGui/qimage_test.py
@@ -35,16 +35,16 @@ class QImageTest(UsesQApplication):
         img2.setColorSpace(img0.colorSpace())
         self.assertEqual(img0, img2)
 
-        ## test scanLine method
+        # test scanLine method
         data1 = img0.scanLine(0)
         data2 = img1.scanLine(0)
         self.assertEqual(data1, data2)
 
     def testEmptyBuffer(self):
-        img = QImage(bytes('', "UTF-8"), 100, 100, QImage.Format_ARGB32)
+        img = QImage(bytes('', "UTF-8"), 100, 100, QImage.Format.Format_ARGB32)  # noqa: F841
 
     def testEmptyStringAsBuffer(self):
-        img = QImage(bytes('', "UTF-8"), 100, 100, QImage.Format_ARGB32)
+        img = QImage(bytes('', "UTF-8"), 100, 100, QImage.Format.Format_ARGB32)  # noqa: F841
 
     def testXpmConstructor(self):
         img = QImage(xpm)
diff --git a/sources/pyside6/tests/QtGui/qimage_win_test.py b/sources/pyside6/tests/QtGui/qimage_win_test.py
index f8ceb4aa9..e7a09a72a 100644
--- a/sources/pyside6/tests/QtGui/qimage_win_test.py
+++ b/sources/pyside6/tests/QtGui/qimage_win_test.py
@@ -19,8 +19,8 @@ from helper.usesqapplication import UsesQApplication
 
 
 def create_image():
-    result = QImage(20, 20, QImage.Format_RGB32)
-    result.fill(Qt.white)
+    result = QImage(20, 20, QImage.Format.Format_RGB32)
+    result.fill(Qt.GlobalColor.white)
     return result
 
 
diff --git a/sources/pyside6/tests/QtGui/qkeysequence_test.py b/sources/pyside6/tests/QtGui/qkeysequence_test.py
index a6f3188d4..56e3a00ff 100644
--- a/sources/pyside6/tests/QtGui/qkeysequence_test.py
+++ b/sources/pyside6/tests/QtGui/qkeysequence_test.py
@@ -23,11 +23,12 @@ class QKeySequenceTest(UsesQApplication):
         # bug #774
         # PYSIDE-1735: Remapped from Qt.Modifier to Qt.KeyboardModifier
         #              Note that Qt.(Keyboard)?Modifier will be no longer IntFlag.
-        ks = QKeySequence(Qt.ShiftModifier, Qt.ControlModifier, Qt.Key_P, Qt.Key_R)
-        self.assertEqual(ks[0].keyboardModifiers(), Qt.ShiftModifier)
-        self.assertEqual(ks[1].keyboardModifiers(), Qt.ControlModifier)
-        self.assertEqual(ks[2].key(), Qt.Key_P)
-        self.assertEqual(ks[3].key(), Qt.Key_R)
+        ks = QKeySequence(Qt.KeyboardModifier.ShiftModifier, Qt.KeyboardModifier.ControlModifier,
+                          Qt.Key.Key_P, Qt.Key.Key_R)
+        self.assertEqual(ks[0].keyboardModifiers(), Qt.KeyboardModifier.ShiftModifier)
+        self.assertEqual(ks[1].keyboardModifiers(), Qt.KeyboardModifier.ControlModifier)
+        self.assertEqual(ks[2].key(), Qt.Key.Key_P)
+        self.assertEqual(ks[3].key(), Qt.Key.Key_R)
 
         def testAutoMnemonic(self):
             qt_set_sequence_auto_mnemonic(True)
diff --git a/sources/pyside6/tests/QtGui/qpainter_test.py b/sources/pyside6/tests/QtGui/qpainter_test.py
index e3ec66381..c304b83e8 100644
--- a/sources/pyside6/tests/QtGui/qpainter_test.py
+++ b/sources/pyside6/tests/QtGui/qpainter_test.py
@@ -27,7 +27,7 @@ except ModuleNotFoundError:
 class QPainterDrawText(UsesQApplication):
     def setUp(self):
         super(QPainterDrawText, self).setUp()
-        self.image = QImage(32, 32, QImage.Format_ARGB32)
+        self.image = QImage(32, 32, QImage.Format.Format_ARGB32)
         self.painter = QPainter(self.image)
         self.text = 'teste!'
 
@@ -42,14 +42,15 @@ class QPainterDrawText(UsesQApplication):
     def testDrawText(self):
         # bug #254
         rect = self.painter.drawText(100, 100, 100, 100,
-                                     Qt.AlignCenter | Qt.TextWordWrap,
+                                     Qt.AlignmentFlag.AlignCenter | Qt.TextFlag.TextWordWrap,
                                      self.text)
         self.assertTrue(isinstance(rect, QRect))
 
     def testDrawTextWithRect(self):
         # bug #225
         rect = QRect(100, 100, 100, 100)
-        newRect = self.painter.drawText(rect, Qt.AlignCenter | Qt.TextWordWrap,
+        newRect = self.painter.drawText(rect,
+                                        Qt.AlignmentFlag.AlignCenter | Qt.TextFlag.TextWordWrap,
                                         self.text)
 
         self.assertTrue(isinstance(newRect, QRect))
@@ -57,7 +58,8 @@ class QPainterDrawText(UsesQApplication):
     def testDrawTextWithRectF(self):
         '''QPainter.drawText(QRectF, ... ,QRectF*) inject code'''
         rect = QRectF(100, 52.3, 100, 100)
-        newRect = self.painter.drawText(rect, Qt.AlignCenter | Qt.TextWordWrap,
+        newRect = self.painter.drawText(rect,
+                                        Qt.AlignmentFlag.AlignCenter | Qt.TextFlag.TextWordWrap,
                                         self.text)
 
         self.assertTrue(isinstance(newRect, QRectF))
@@ -105,7 +107,7 @@ class SetBrushWithOtherArgs(UsesQApplication):
     '''Using qpainter.setBrush with args other than QBrush'''
 
     def testSetBrushGradient(self):
-        image = QImage(32, 32, QImage.Format_ARGB32)
+        image = QImage(32, 32, QImage.Format.Format_ARGB32)
         with QPainter(image) as painter:
             gradient = QLinearGradient(0, 0, 0, 0)
             painter.setBrush(gradient)
diff --git a/sources/pyside6/tests/QtGui/qpdfwriter_test.py b/sources/pyside6/tests/QtGui/qpdfwriter_test.py
index 1379f8e80..2b1549384 100644
--- a/sources/pyside6/tests/QtGui/qpdfwriter_test.py
+++ b/sources/pyside6/tests/QtGui/qpdfwriter_test.py
@@ -22,7 +22,9 @@ class QPdfWriterTest(UsesQApplication):
         temporaryFile = QTemporaryFile(QDir.tempPath() + "/pdfwriter_test_XXXXXX.pdf")
         self.assertTrue(temporaryFile.open())
         pdfWriter = QPdfWriter(temporaryFile)
-        pdfWriter.setPageLayout(QPageLayout(QPageSize(QPageSize.A4), QPageLayout.Portrait, QMarginsF(10, 10, 10, 10)))
+        pdfWriter.setPageLayout(QPageLayout(QPageSize(QPageSize.PageSizeId.A4),
+                                QPageLayout.Orientation.Portrait,
+                                QMarginsF(10, 10, 10, 10)))
         doc = QTextDocument("Some text")
         doc.print_(pdfWriter)
         temporaryFile.close()
diff --git a/sources/pyside6/tests/QtGui/qpen_test.py b/sources/pyside6/tests/QtGui/qpen_test.py
index a3328c2e7..1a187c1ed 100644
--- a/sources/pyside6/tests/QtGui/qpen_test.py
+++ b/sources/pyside6/tests/QtGui/qpen_test.py
@@ -25,9 +25,9 @@ class Painting(QRasterWindow):
 
     def paintEvent(self, event):
         with QPainter(self) as painter:
-            painter.setPen(Qt.NoPen)
+            painter.setPen(Qt.PenStyle.NoPen)
             self.penFromEnum = painter.pen()
-            intVal = Qt.NoPen.value
+            intVal = Qt.PenStyle.NoPen.value
             painter.setPen(intVal)
             self.penFromInteger = painter.pen()
         QTimer.singleShot(20, self.close)
@@ -41,7 +41,7 @@ class QPenTest(UsesQApplication):
         style = Qt.PenStyle(0)
         cap = Qt.PenCapStyle(0)
         join = Qt.PenJoinStyle(0)
-        pen = QPen(Qt.blue, width, style, cap, join)  # noqa: F841
+        pen = QPen(Qt.GlobalColor.blue, width, style, cap, join)  # noqa: F841
 
     def testSetPenWithPenStyleEnum(self):
         '''Calls QPainter.setPen with both enum and integer. Bug #511.'''
@@ -49,8 +49,8 @@ class QPenTest(UsesQApplication):
         w.show()
         w.setTitle("qpen_test")
         self.app.exec()
-        self.assertEqual(w.penFromEnum.style(), Qt.NoPen)
-        self.assertEqual(w.penFromInteger.style(), Qt.SolidLine)
+        self.assertEqual(w.penFromEnum.style(), Qt.PenStyle.NoPen)
+        self.assertEqual(w.penFromInteger.style(), Qt.PenStyle.SolidLine)
 
 
 if __name__ == '__main__':
diff --git a/sources/pyside6/tests/QtGui/qpixelformat_test.py b/sources/pyside6/tests/QtGui/qpixelformat_test.py
index 32d34a577..f9239b255 100644
--- a/sources/pyside6/tests/QtGui/qpixelformat_test.py
+++ b/sources/pyside6/tests/QtGui/qpixelformat_test.py
@@ -20,8 +20,8 @@ from PySide6.QtGui import QColor, QImage, QPixelFormat, qPixelFormatRgba
 
 class QPixelFormatTest(UsesQApplication):
     def test(self):
-        image = QImage(QSize(200, 200), QImage.Format_ARGB32)
-        image.fill(QColor(Qt.red))
+        image = QImage(QSize(200, 200), QImage.Format.Format_ARGB32)
+        image.fill(QColor(Qt.GlobalColor.red))
         pixelFormat = image.pixelFormat()
         print(pixelFormat.greenSize())
         self.assertEqual(pixelFormat.alphaSize(), 8)
@@ -31,9 +31,10 @@ class QPixelFormatTest(UsesQApplication):
         self.assertEqual(pixelFormat.bitsPerPixel(), 32)
 
     def testHelpers(self):
-        format = qPixelFormatRgba(8, 8, 8, 8, QPixelFormat.UsesAlpha,
-                                  QPixelFormat.AtBeginning, QPixelFormat.Premultiplied,
-                                  QPixelFormat.UnsignedByte)
+        format = qPixelFormatRgba(8, 8, 8, 8, QPixelFormat.AlphaUsage.UsesAlpha,
+                                  QPixelFormat.AlphaPosition.AtBeginning,
+                                  QPixelFormat.AlphaPremultiplied.Premultiplied,
+                                  QPixelFormat.TypeInterpretation.UnsignedByte)
         self.assertEqual(format.redSize(), 8)
 
 
diff --git a/sources/pyside6/tests/QtGui/qpixmap_test.py b/sources/pyside6/tests/QtGui/qpixmap_test.py
index 12be6d28c..0451b9839 100644
--- a/sources/pyside6/tests/QtGui/qpixmap_test.py
+++ b/sources/pyside6/tests/QtGui/qpixmap_test.py
@@ -37,7 +37,7 @@ class QPixmapTest(UsesQApplication):
 
     def testQPixmapLoadFromDataWithQFile(self):
         f = QFile(self._sample_file)
-        self.assertTrue(f.open(QIODevice.ReadOnly))
+        self.assertTrue(f.open(QIODevice.OpenModeFlag.ReadOnly))
         data = f.read(f.size())
         f.close()
         pixmap = QPixmap()
@@ -54,8 +54,9 @@ class QPixmapToImage(UsesQApplication):
 
     def testFilledImage(self):
         '''QPixmap.fill + toImage + image.pixel'''
+        red = QColor(Qt.GlobalColor.red)
         pixmap = QPixmap(100, 200)
-        pixmap.fill(Qt.red)  # Default Qt.white
+        pixmap.fill(red)  # Default Qt.GlobalColor.white
 
         self.assertEqual(pixmap.height(), 200)
         self.assertEqual(pixmap.width(), 100)
@@ -66,7 +67,7 @@ class QPixmapToImage(UsesQApplication):
         self.assertEqual(image.width(), 100)
 
         pixel = image.pixel(10, 10)
-        self.assertEqual(pixel, QColor(Qt.red).rgba())
+        self.assertEqual(pixel, red.rgba())
 
 
 if __name__ == '__main__':
diff --git a/sources/pyside6/tests/QtGui/qrasterwindow_test.py b/sources/pyside6/tests/QtGui/qrasterwindow_test.py
index 038ce8836..09fcd46e8 100644
--- a/sources/pyside6/tests/QtGui/qrasterwindow_test.py
+++ b/sources/pyside6/tests/QtGui/qrasterwindow_test.py
@@ -28,7 +28,7 @@ class StaticTextRasterWindow(QRasterWindow):
     def paintEvent(self, event):
         clientRect = QRect(QPoint(0, 0), self.size())
         with QPainter(self) as painter:
-            painter.fillRect(clientRect, QColor(Qt.red))
+            painter.fillRect(clientRect, QColor(Qt.GlobalColor.red))
             painter.drawStaticText(QPoint(10, 10), self.text)
 
 
@@ -43,16 +43,16 @@ class TextDocumentWindow(QRasterWindow):
     def paintEvent(self, event):
         with QPainter(self) as painter:
             clientRect = QRect(QPoint(0, 0), self.size())
-            painter.fillRect(clientRect, QColor(Qt.white))
+            painter.fillRect(clientRect, QColor(Qt.GlobalColor.white))
             ctx = QAbstractTextDocumentLayout.PaintContext()
             ctx.clip = clientRect
 
             sel = QAbstractTextDocumentLayout.Selection()
             cursor = QTextCursor(self.m_document)
-            cursor.movePosition(QTextCursor.Start)
-            cursor.movePosition(QTextCursor.NextWord, QTextCursor.KeepAnchor)
+            cursor.movePosition(QTextCursor.MoveOperation.Start)
+            cursor.movePosition(QTextCursor.MoveOperation.NextWord, QTextCursor.MoveMode.KeepAnchor)
             sel.cursor = cursor
-            sel.format.setForeground(Qt.red)
+            sel.format.setForeground(Qt.GlobalColor.red)
             ctx.selections = [sel]
 
             self.m_document.documentLayout().draw(painter, ctx)
diff --git a/sources/pyside6/tests/QtGui/qshortcut_test.py b/sources/pyside6/tests/QtGui/qshortcut_test.py
index 91bf1cd18..b093a01a8 100644
--- a/sources/pyside6/tests/QtGui/qshortcut_test.py
+++ b/sources/pyside6/tests/QtGui/qshortcut_test.py
@@ -44,8 +44,8 @@ class QAppPresence(unittest.TestCase):
         self.qapp = QGuiApplication([])
         f = Foo()
 
-        self.sc = MyShortcut(QKeySequence(Qt.Key_Return), f, f.slot_of_foo)
-        self.scstd = MyShortcut(QKeySequence.Copy, f, f.slot_of_copy)
+        self.sc = MyShortcut(QKeySequence(Qt.Key.Key_Return), f, f.slot_of_foo)
+        self.scstd = MyShortcut(QKeySequence.StandardKey.Copy, f, f.slot_of_copy)
         QTimer.singleShot(0, self.init)
         self.qapp.exec()
         self.assertEqual(f.ok, True)
diff --git a/sources/pyside6/tests/QtGui/qtextdocument_functions.py b/sources/pyside6/tests/QtGui/qtextdocument_functions.py
index 0350c93ac..7d4a85177 100644
--- a/sources/pyside6/tests/QtGui/qtextdocument_functions.py
+++ b/sources/pyside6/tests/QtGui/qtextdocument_functions.py
@@ -8,10 +8,10 @@ import unittest
 
 from pathlib import Path
 sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
-from init_paths import init_test_paths
+from init_paths import init_test_paths  # noqa: E402
 init_test_paths(False)
 
-from PySide6.QtGui import QPageRanges, Qt
+from PySide6.QtGui import QPageRanges, Qt  # noqa: E402
 
 
 class QTextDocumentFunctions(unittest.TestCase):
@@ -19,7 +19,7 @@ class QTextDocumentFunctions(unittest.TestCase):
     def testFunctions(self):
         self.assertFalse(Qt.mightBeRichText('bla'))
         self.assertTrue(Qt.mightBeRichText('<html><head/><body><p>bla</p></body></html>'))
-        html = Qt.convertFromPlainText("A & B", Qt.WhiteSpaceNormal)
+        html = Qt.convertFromPlainText("A & B", Qt.WhiteSpaceMode.WhiteSpaceNormal)
         self.assertEqual(html, '<p>A &amp; B</p>')
 
 
diff --git a/sources/pyside6/tests/QtGui/qtextdocumentwriter_test.py b/sources/pyside6/tests/QtGui/qtextdocumentwriter_test.py
index b8401d960..5ca207794 100644
--- a/sources/pyside6/tests/QtGui/qtextdocumentwriter_test.py
+++ b/sources/pyside6/tests/QtGui/qtextdocumentwriter_test.py
@@ -21,7 +21,7 @@ class QTextDocumentWriterTest(unittest.TestCase):
         text = 'foobar'
         doc = QTextDocument(text)
         b = QBuffer()
-        b.open(QBuffer.ReadWrite)
+        b.open(QBuffer.OpenModeFlag.ReadWrite)
         writer = QTextDocumentWriter(b, bytes("plaintext", "UTF-8"))
         writer.write(doc)
         b.close()
diff --git a/sources/pyside6/tests/QtGui/qtextline_test.py b/sources/pyside6/tests/QtGui/qtextline_test.py
index b8592526c..f9ecafd4d 100644
--- a/sources/pyside6/tests/QtGui/qtextline_test.py
+++ b/sources/pyside6/tests/QtGui/qtextline_test.py
@@ -31,7 +31,7 @@ class QTextLineTest(UsesQApplication):
 
     def testTextOption(self):
         """PYSIDE-2088, large enum values causing MSVC issues."""
-        v = QTextOption.IncludeTrailingSpaces | QTextOption.ShowTabsAndSpaces
+        v = QTextOption.Flag.IncludeTrailingSpaces | QTextOption.Flag.ShowTabsAndSpaces
         self.assertEqual(v.value, 2147483649)