diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-03-23 10:24:51 +0000 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-03-23 10:34:38 +0000 |
commit | 136407e3eb88b5480cf5a37e9234e698ef6cff2d (patch) | |
tree | 3101b2399af6b6d7763557a98e2672663a31b3b3 | |
parent | 37b0f2003c482a1f64c895efab1522bbb30de746 (diff) | |
download | qtbase-136407e3eb88b5480cf5a37e9234e698ef6cff2d.tar.gz |
Revert "QImage::operator==: Also compare the image colorspace"v6.3.0-rc1
This reverts commit 019d0dd4b49d5a0e9cbb73829158e798ea25fd86.
Reason for revert: Causes test failures, and better for just 6.4
Pick-to: 6.3
Change-Id: Iaf1dc18d6f347fd203b07253ad502b6060486157
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
-rw-r--r-- | src/gui/image/qimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 87c8f8dde1..a4743bff4d 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -3961,7 +3961,7 @@ bool QImage::operator==(const QImage & i) const return false; // obviously different stuff? - if (i.d->height != d->height || i.d->width != d->width || i.d->format != d->format || i.d->colorSpace != d->colorSpace) + if (i.d->height != d->height || i.d->width != d->width || i.d->format != d->format) return false; if (d->format != Format_RGB32) { |