Merge tag 'v5.15.4-lts' into tqtc/lts-5.15-opensourcev5.15.4-lts-lgpl

Qt For Python Release 5.15.4

Change-Id: I8457501ba90fc481fb9de686eb8a2f880ecc06cd

1 files changed, 5 insertions, 3 deletions

diff --git a/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py b/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py
index c9b5c16a5..4db0a0a6e 100644
--- a/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py
+++ b/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py
@@ -47,7 +47,9 @@ class QPixmapQDatastream(UsesQApplication):
     def setUp(self):
         super(QPixmapQDatastream, self).setUp()
         self.source_pixmap = QPixmap(100, 100)
-        self.source_pixmap.fill(Qt.red)
+        # PYSIDE-1533: Use Qt.transparent to force Format_ARGB32_Premultiplied
+        # when converting to QImage in any case.
+        self.source_pixmap.fill(Qt.transparent)
         self.output_pixmap = QPixmap()
         self.buffer = QByteArray()
         self.read_stream = QDataStream(self.buffer, QIODevice.ReadOnly)
@@ -60,8 +62,8 @@ class QPixmapQDatastream(UsesQApplication):
 
         image = self.output_pixmap.toImage()
         pixel = image.pixel(10,10)
-        self.assertEqual(pixel, QColor(Qt.red).rgba())
-        self.assertEqual(self.source_pixmap.toImage(), self.output_pixmap.toImage())
+        self.assertEqual(pixel, QColor(Qt.transparent).rgba())
+        self.assertEqual(self.source_pixmap.toImage(), image)
 
 
 if __name__ == '__main__':