From 4e3dc9a06b4459b444af44a234ff37434ed1253f Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Mon, 28 Dec 2020 12:58:08 +0200
Subject: [PATCH] Add support for PySide6

---
 Tests/test_imageqt.py               |  4 +++-
 Tests/test_qt_image_qapplication.py |  5 ++++-
 src/PIL/ImageQt.py                  | 11 +++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Tests/test_imageqt.py b/Tests/test_imageqt.py
index 7a6e1354f..cf4aba982 100644
--- 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
index ef1ff5901..8d76eca3c 100644
--- a/Tests/test_qt_image_qapplication.py
+++ b/Tests/test_qt_image_qapplication.py
@@ -7,7 +7,10 @@ from .helper import assert_image_equal, hopper
 if ImageQt.qt_is_installed:
     from PIL.ImageQt import QPixmap
 
-    if ImageQt.qt_version == "5":
+    if ImageQt.qt_version == "side6":
+        from PySide6 import QtGui
+        from PySide6.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget
+    elif ImageQt.qt_version == "5":
         from PyQt5 import QtGui
         from PyQt5.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget
     elif ImageQt.qt_version == "side2":
diff --git a/src/PIL/ImageQt.py b/src/PIL/ImageQt.py
index 91be53488..64f07be11 100644
--- a/src/PIL/ImageQt.py
+++ b/src/PIL/ImageQt.py
@@ -22,13 +22,20 @@ from io import BytesIO
 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":