Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c

4 files changed, 37 insertions, 40 deletions

diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index 441ec17412..b84aa52465 100644
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -303,6 +303,8 @@ static QLatin1String formatToString(QImage::Format format)
         return QLatin1String("RGBA64pm");
     case QImage::Format_Grayscale16:
         return QLatin1String("Grayscale16");
+    case QImage::Format_BGR888:
+        return QLatin1String("BGR888");
     default:
         break;
     };
@@ -844,6 +846,13 @@ void tst_QImage::convertToFormat_data()
     QTest::newRow("blue rgb32 -> rgb888") << int(QImage::Format_RGB32) << 0xff0000ff
                                           << int(QImage::Format_RGB888) << 0xff0000ff;
 
+    QTest::newRow("red rgb32 -> bgr888") << int(QImage::Format_RGB32) << 0xffff0000
+                                         << int(QImage::Format_BGR888) << 0xffff0000;
+    QTest::newRow("green rgb32 -> bgr888") << int(QImage::Format_RGB32) << 0xff00ff00
+                                           << int(QImage::Format_BGR888) << 0xff00ff00;
+    QTest::newRow("blue rgb32 -> bgr888") << int(QImage::Format_RGB32) << 0xff0000ff
+                                          << int(QImage::Format_BGR888) << 0xff0000ff;
+
     QTest::newRow("red rgb16 -> rgb888") << int(QImage::Format_RGB16) << 0xffff0000
                                          << int(QImage::Format_RGB888) << 0xffff0000;
     QTest::newRow("green rgb16 -> rgb888") << int(QImage::Format_RGB16) << 0xff00ff00
@@ -858,6 +867,13 @@ void tst_QImage::convertToFormat_data()
     QTest::newRow("blue rgb888 -> argb32") << int(QImage::Format_RGB888) << 0xff0000ff
                                            << int(QImage::Format_ARGB32) << 0xff0000ff;
 
+    QTest::newRow("red bgr888 -> argb32") << int(QImage::Format_RGB888) << 0xffff0000
+                                          << int(QImage::Format_ARGB32) << 0xffff0000;
+    QTest::newRow("green bgr888 -> argb32") << int(QImage::Format_RGB888) << 0xff00ff00
+                                            << int(QImage::Format_ARGB32) << 0xff00ff00;
+    QTest::newRow("blue bgr888 -> argb32") << int(QImage::Format_RGB888) << 0xff0000ff
+                                           << int(QImage::Format_ARGB32) << 0xff0000ff;
+
     QTest::newRow("red rgb888 -> rgbx8888") << int(QImage::Format_RGB888) << 0xffff0000
                                             << int(QImage::Format_RGBX8888) << 0xffff0000;
     QTest::newRow("green rgb888 -> rgbx8888") << int(QImage::Format_RGB888) << 0xff00ff00
@@ -1338,6 +1354,12 @@ void tst_QImage::setPixel_data()
                                   << 0xff00ff00 << 0x00ff00u;
     QTest::newRow("RGB888 blue") << int(QImage::Format_RGB888)
                                  << 0xff0000ff << 0x0000ffu;
+    QTest::newRow("BGR888 red") << int(QImage::Format_BGR888)
+                                << 0xffff0000 << 0x0000ffu;
+    QTest::newRow("BGR888 green") << int(QImage::Format_BGR888)
+                                  << 0xff00ff00 << 0x00ff00u;
+    QTest::newRow("BGR888 blue") << int(QImage::Format_BGR888)
+                                 << 0xff0000ff << 0xff0000u;
 #if Q_BYTE_ORDER == Q_BIG_ENDIAN
     QTest::newRow("RGBA8888 red") << int(QImage::Format_RGBA8888)
                                 << 0xffff0000u << 0xff0000ffu;
@@ -1425,6 +1447,7 @@ void tst_QImage::setPixel()
     case int(QImage::Format_ARGB8565_Premultiplied):
     case int(QImage::Format_ARGB8555_Premultiplied):
     case int(QImage::Format_RGB888):
+    case int(QImage::Format_BGR888):
     {
         for (int y = 0; y < h; ++y) {
             const quint24 *row = (const quint24*)(img.scanLine(y));
@@ -2445,6 +2468,7 @@ void tst_QImage::mirrored_data()
     QTest::newRow("Format_RGB555, vertical") << QImage::Format_RGB555 << true << false << 16 << 16;
     QTest::newRow("Format_ARGB8555_Premultiplied, vertical") << QImage::Format_ARGB8555_Premultiplied << true << false << 16 << 16;
     QTest::newRow("Format_RGB888, vertical") << QImage::Format_RGB888 << true << false << 16 << 16;
+    QTest::newRow("Format_BGR888, vertical") << QImage::Format_BGR888 << true << false << 16 << 16;
     QTest::newRow("Format_RGB444, vertical") << QImage::Format_RGB444 << true << false << 16 << 16;
     QTest::newRow("Format_RGBX8888, vertical") << QImage::Format_RGBX8888 << true << false << 16 << 16;
     QTest::newRow("Format_RGBA8888_Premultiplied, vertical") << QImage::Format_RGBA8888_Premultiplied << true << false << 16 << 16;
diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index 8b42b139a3..f6ffd7b7c5 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -1863,6 +1863,7 @@ void tst_QImageReader::saveFormat_data()
     QTest::newRow("Format_RGB555") << QImage::Format_RGB555;
     QTest::newRow("Format_ARGB8555_Premultiplied") << QImage::Format_ARGB8555_Premultiplied;
     QTest::newRow("Format_RGB888") << QImage::Format_RGB888;
+    QTest::newRow("Format_BGR888") << QImage::Format_BGR888;
     QTest::newRow("Format_RGB444") << QImage::Format_RGB444;
     QTest::newRow("Format_ARGB4444_Premultiplied") << QImage::Format_ARGB4444_Premultiplied;
     QTest::newRow("Format_RGBA64") << QImage::Format_RGBA64;
@@ -1913,6 +1914,14 @@ void tst_QImageReader::saveColorSpace()
     QImage stored = QImage::fromData(buf.buffer(), "png");
 
     QCOMPARE(stored, orig);
+    QCOMPARE(stored.colorSpace(), orig.colorSpace());
+
+    buf.open(QIODevice::WriteOnly);
+    QVERIFY(orig.save(&buf, "jpeg"));
+    buf.close();
+    stored = QImage::fromData(buf.buffer(), "jpeg");
+
+    QCOMPARE(stored.colorSpace(), orig.colorSpace());
 }
 
 void tst_QImageReader::readText_data()
diff --git a/tests/auto/gui/image/qpicture/tst_qpicture.cpp b/tests/auto/gui/image/qpicture/tst_qpicture.cpp
index ec6bb8dcee..6287960457 100644
--- a/tests/auto/gui/image/qpicture/tst_qpicture.cpp
+++ b/tests/auto/gui/image/qpicture/tst_qpicture.cpp
@@ -37,6 +37,8 @@
 #include <qscreen.h>
 #include <limits.h>
 
+#ifndef QT_NO_PICTURE
+
 class tst_QPicture : public QObject
 {
     Q_OBJECT
@@ -45,7 +47,6 @@ public:
     tst_QPicture();
 
 private slots:
-    void getSetCheck();
     void devType();
     void paintingActive();
     void boundingRect();
@@ -56,31 +57,6 @@ private slots:
     void boundaryValues();
 };
 
-// Testing get/set functions
-void tst_QPicture::getSetCheck()
-{
-    QPictureIO obj1;
-    // const QPicture & QPictureIO::picture()
-    // void QPictureIO::setPicture(const QPicture &)
-    // const char * QPictureIO::format()
-    // void QPictureIO::setFormat(const char *)
-    const char var2[] = "PNG";
-    obj1.setFormat(var2);
-    QCOMPARE(var2, obj1.format());
-    obj1.setFormat((char *)0);
-    // The format is stored internally in a QString, so return is always a valid char *
-    QVERIFY(QString(obj1.format()).isEmpty());
-
-    // const char * QPictureIO::parameters()
-    // void QPictureIO::setParameters(const char *)
-    const char var3[] = "Bogus data";
-    obj1.setParameters(var3);
-    QCOMPARE(var3, obj1.parameters());
-    obj1.setParameters((char *)0);
-    // The format is stored internally in a QString, so return is always a valid char *
-    QVERIFY(QString(obj1.parameters()).isEmpty());
-}
-
 tst_QPicture::tst_QPicture()
 {
 }
@@ -316,6 +292,7 @@ void tst_QPicture::boundaryValues()
     painter.end();
 }
 
-
 QTEST_MAIN(tst_QPicture)
 #include "tst_qpicture.moc"
+
+#endif // QT_NO_PICTURE
diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
index 4d31d80246..ba5df809f2 100644
--- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
@@ -267,10 +267,6 @@ void tst_QPixmap::fromImage()
     image.fill(0x7f7f7f7f);
 
     const QPixmap pixmap = QPixmap::fromImage(image);
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    if (pixmap.handle()->classId() == QPlatformPixmap::X11Class && !pixmap.x11PictureHandle())
-        QSKIP("Requires XRender support");
-#endif
     const QImage result = pixmap.toImage();
     image = image.convertToFormat(result.format());
     QCOMPARE(result, image);
@@ -491,11 +487,6 @@ void tst_QPixmap::fill()
     else
         pm = QPixmap(400, 400);
 
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    if (!bitmap && pm.handle()->classId() == QPlatformPixmap::X11Class && !pm.x11PictureHandle())
-        QSKIP("Requires XRender support");
-#endif
-
     pm.fill(color);
     if (syscolor && !bitmap && pm.depth() < 24) {
         QSKIP("Test does not work on displays without true color");
@@ -521,10 +512,6 @@ void tst_QPixmap::fill()
 void tst_QPixmap::fill_transparent()
 {
     QPixmap pixmap(10, 10);
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    if (pixmap.handle()->classId() == QPlatformPixmap::X11Class && !pixmap.x11PictureHandle())
-        QSKIP("Requires XRender support");
-#endif
     pixmap.fill(Qt::transparent);
     QVERIFY(pixmap.hasAlphaChannel());
 }