Merge pull request #8159 from radarhere/qt6

hugovk · web-flow · commit 020170773787 · 2024-06-22T22:14:27.000-06:00
Removed support for Qt 5
diff --git a/Tests/test_imageqt.py b/Tests/test_imageqt.py
@@ -41,18 +41,13 @@ def checkrgb(r: int, g: int, b: int) -> None:
     checkrgb(0, 0, 255)
 
 
-def test_image() -> None:
-    modes = ["1", "RGB", "RGBA", "L", "P"]
-    qt_format = ImageQt.QImage.Format if ImageQt.qt_version == "6" else ImageQt.QImage
-    if hasattr(qt_format, "Format_Grayscale16"):  # Qt 5.13+
-        modes.append("I;16")
-
-    for mode in modes:
-        im = hopper(mode)
-        roundtripped_im = ImageQt.fromqimage(ImageQt.ImageQt(im))
-        if mode not in ("RGB", "RGBA"):
-            im = im.convert("RGB")
-        assert_image_similar(roundtripped_im, im, 1)
+@pytest.mark.parametrize("mode", ("1", "RGB", "RGBA", "L", "P", "I;16"))
+def test_image(mode: str) -> None:
+    im = hopper(mode)
+    roundtripped_im = ImageQt.fromqimage(ImageQt.ImageQt(im))
+    if mode not in ("RGB", "RGBA"):
+        im = im.convert("RGB")
+    assert_image_similar(roundtripped_im, im, 1)
 
 
 def test_closed_file() -> None:
diff --git a/src/PIL/ImageQt.py b/src/PIL/ImageQt.py
@@ -152,7 +152,7 @@ def _toqclass_helper(im):
     elif im.mode == "RGBA":
         data = im.tobytes("raw", "BGRA")
         format = qt_format.Format_ARGB32
-    elif im.mode == "I;16" and hasattr(qt_format, "Format_Grayscale16"):  # Qt 5.13+
+    elif im.mode == "I;16":
         im = im.point(lambda i: i * 256)
 
         format = qt_format.Format_Grayscale16
