From be356545daca6add940256d7fb2022bb2a0866aa Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 6 Apr 2021 10:09:41 +0200 Subject: Prospective fix for QPixmap/QDataStream serialization test The pixmaps are converted to QImage for conversion which seems to result in odd image formats in some cases. Use a transparent color to force alpha. Fixes: PYSIDE-1533 Pick-to: 5.15 Change-Id: I1499e18fa9d2176182c890171888b76153aef06f Reviewed-by: Christian Tismer --- sources/pyside6/tests/QtGui/qdatastream_gui_operators_test.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sources') diff --git a/sources/pyside6/tests/QtGui/qdatastream_gui_operators_test.py b/sources/pyside6/tests/QtGui/qdatastream_gui_operators_test.py index 580d962c3..ed1ff4528 100644 --- a/sources/pyside6/tests/QtGui/qdatastream_gui_operators_test.py +++ b/sources/pyside6/tests/QtGui/qdatastream_gui_operators_test.py @@ -48,7 +48,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) @@ -61,8 +63,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__': -- cgit v1.2.3