Merge pull request #5161 from hugovk/add-pyside6

Add support for PySide6
python-pillow · Jan 1, 2021 · f54ea8f · f54ea8f
2 parents 11e63b6 + effa65c
commit f54ea8f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/Tests/test_imageqt.py b/Tests/test_imageqt.py
@@ -14,7 +14,9 @@ def test_rgb():
     # typedef QRgb
     # An ARGB quadruplet on the format #AARRGGBB,
     # equivalent to an unsigned int.
-    if ImageQt.qt_version == "5":
+    if ImageQt.qt_version == "side6":
+        from PySide6.QtGui import qRgb
+    elif ImageQt.qt_version == "5":
         from PyQt5.QtGui import qRgb
     elif ImageQt.qt_version == "side2":
         from PySide2.QtGui import qRgb

diff --git a/Tests/test_qt_image_qapplication.py b/Tests/test_qt_image_qapplication.py
@@ -7,11 +7,11 @@
 if ImageQt.qt_is_installed:
     from PIL.ImageQt import QPixmap
 
-    if ImageQt.qt_version == "5":
-        from PyQt5 import QtGui
+    if ImageQt.qt_version == "side6":
+        from PySide6.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget
+    elif ImageQt.qt_version == "5":
         from PyQt5.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget
     elif ImageQt.qt_version == "side2":
-        from PySide2 import QtGui
         from PySide2.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget
 
     class Example(QWidget):
@@ -22,7 +22,7 @@ def __init__(self):
 
             qimage = ImageQt.ImageQt(img)
 
-            pixmap1 = QtGui.QPixmap.fromImage(qimage)
+            pixmap1 = ImageQt.QPixmap.fromImage(qimage)
 
             QHBoxLayout(self)  # hbox
 

diff --git a/src/PIL/ImageQt.py b/src/PIL/ImageQt.py
@@ -22,13 +22,20 @@
 from . import Image
 from ._util import isPath
 
-qt_versions = [["5", "PyQt5"], ["side2", "PySide2"]]
+qt_versions = [
+    ["side6", "PySide6"],
+    ["5", "PyQt5"],
+    ["side2", "PySide2"],
+]
 
 # If a version has already been imported, attempt it first
 qt_versions.sort(key=lambda qt_version: qt_version[1] in sys.modules, reverse=True)
 for qt_version, qt_module in qt_versions:
     try:
-        if qt_module == "PyQt5":
+        if qt_module == "PySide6":
+            from PySide6.QtCore import QBuffer, QIODevice
+            from PySide6.QtGui import QImage, QPixmap, qRgba
+        elif qt_module == "PyQt5":
             from PyQt5.QtCore import QBuffer, QIODevice
             from PyQt5.QtGui import QImage, QPixmap, qRgba
         elif qt_module == "PySide2":