Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"

3 files changed, 71 insertions, 12 deletions

diff --git a/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
index 2dbb078ae0..fe12175081 100644
--- a/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
+++ b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
@@ -164,7 +164,7 @@ void tst_QIcoImageFormat::imageCount_data()
     QTest::newRow("16px,32px - 16 colors") << "valid/TIMER01.ICO" << 2;
     QTest::newRow("16px16c, 32px32c, 32px256c 1") << "valid/WORLD.ico" << 3;
     QTest::newRow("16px16c, 32px32c, 32px256c 2") << "valid/WORLDH.ico" << 3;
-    QTest::newRow("invalid floppy (first 8 bytes = 0xff)") << "invalid/35floppy.ico" << 0;
+    QTest::newRow("invalid floppy (first 8 bytes = 0xff)") << "invalid/35floppy.ico" << -1;
     QTest::newRow("includes 32BPP w/alpha") << "valid/semitransparent.ico" << 9;
     QTest::newRow("PNG compression") << "valid/Qt.ico" << 4;
     QTest::newRow("CUR file") << "valid/yellow.cur" << 1;
@@ -177,7 +177,6 @@ void tst_QIcoImageFormat::imageCount()
 
     QImageReader reader(m_IconPath + QLatin1Char('/') + fileName);
     QCOMPARE(reader.imageCount(), count);
-
 }
 
 void tst_QIcoImageFormat::jumpToNextImage_data()
@@ -218,7 +217,7 @@ void tst_QIcoImageFormat::loopCount_data()
     QTest::addColumn<int>("count");
 
     QTest::newRow("floppy (16px,32px - 16 colors)") << "valid/35FLOPPY.ICO" << 0;
-    QTest::newRow("invalid floppy (first 8 bytes = 0xff)") << "invalid/35floppy.ico" << 0;
+    QTest::newRow("invalid floppy (first 8 bytes = 0xff)") << "invalid/35floppy.ico" << -1;
 }
 
 void tst_QIcoImageFormat::loopCount()
@@ -228,6 +227,7 @@ void tst_QIcoImageFormat::loopCount()
 
     QImageReader reader(m_IconPath + QLatin1Char('/') + fileName);
     QCOMPARE(reader.loopCount(), count);
+    QCOMPARE(reader.canRead(), count < 0 ? false : true);
 }
 
 void tst_QIcoImageFormat::nextImageDelay_data()
@@ -256,7 +256,7 @@ void tst_QIcoImageFormat::nextImageDelay()
 
     QImageReader reader(m_IconPath + QLatin1Char('/') + fileName);
     if (count == -1) {
-        QCOMPARE(reader.nextImageDelay(), 0);
+        QCOMPARE(reader.nextImageDelay(), -1);
     } else {
         int i;
         for (i = 0; i < count; i++) {
diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index d17a171728..8b42b139a3 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -30,6 +30,7 @@
 #include <QtTest/QtTest>
 
 #include <QBuffer>
+#include <QColorSpace>
 #include <QDebug>
 #include <QImage>
 #include <QImageReader>
@@ -158,6 +159,9 @@ private slots:
     void saveFormat_data();
     void saveFormat();
 
+    void saveColorSpace_data();
+    void saveColorSpace();
+
     void readText_data();
     void readText();
 
@@ -1883,6 +1887,33 @@ void tst_QImageReader::saveFormat()
     QCOMPARE(stored, converted);
 }
 
+void tst_QImageReader::saveColorSpace_data()
+{
+    QTest::addColumn<QColorSpace::ColorSpaceId>("colorspaceId");
+
+    QTest::newRow("Undefined")    << QColorSpace::Undefined;
+    QTest::newRow("sRGB")         << QColorSpace::SRgb;
+    QTest::newRow("sRGB(linear)") << QColorSpace::SRgbLinear;
+    QTest::newRow("AdobeRGB")     << QColorSpace::AdobeRgb;
+    QTest::newRow("DisplayP3")    << QColorSpace::DisplayP3;
+    QTest::newRow("ProPhotoRgb")  << QColorSpace::ProPhotoRgb;
+}
+
+void tst_QImageReader::saveColorSpace()
+{
+    QFETCH(QColorSpace::ColorSpaceId, colorspaceId);
+
+    QImage orig(":/images/kollada.png");
+
+    orig.setColorSpace(colorspaceId);
+    QBuffer buf;
+    buf.open(QIODevice::WriteOnly);
+    QVERIFY(orig.save(&buf, "png"));
+    buf.close();
+    QImage stored = QImage::fromData(buf.buffer(), "png");
+
+    QCOMPARE(stored, orig);
+}
 
 void tst_QImageReader::readText_data()
 {
diff --git a/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp
index 158530428d..3158883ef5 100644
--- a/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp
+++ b/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp
@@ -104,18 +104,28 @@ void tst_QPixmapCache::cacheLimit()
 
 void tst_QPixmapCache::setCacheLimit()
 {
+    QPixmap res;
     QPixmap *p1 = new QPixmap(2, 3);
     QPixmapCache::insert("P1", *p1);
+#if QT_DEPRECATED_SINCE(5, 13)
     QVERIFY(QPixmapCache::find("P1") != 0);
+#endif
+    QVERIFY(QPixmapCache::find("P1", &res));
     delete p1;
 
     QPixmapCache::setCacheLimit(0);
+#if QT_DEPRECATED_SINCE(5, 13)
     QVERIFY(!QPixmapCache::find("P1"));
+#endif
+    QVERIFY(!QPixmapCache::find("P1", &res));
 
     p1 = new QPixmap(2, 3);
     QPixmapCache::setCacheLimit(1000);
     QPixmapCache::insert("P1", *p1);
+#if QT_DEPRECATED_SINCE(5, 13)
     QVERIFY(QPixmapCache::find("P1") != 0);
+#endif
+    QVERIFY(QPixmapCache::find("P1", &res));
 
     delete p1;
 
@@ -200,6 +210,7 @@ void tst_QPixmapCache::find()
     QVERIFY(QPixmapCache::insert("P1", p1));
 
     QPixmap p2;
+#if QT_DEPRECATED_SINCE(5, 13)
     QVERIFY(QPixmapCache::find("P1", p2));
     QCOMPARE(p2.width(), 10);
     QCOMPARE(p2.height(), 10);
@@ -209,6 +220,12 @@ void tst_QPixmapCache::find()
     QPixmap *p3 = QPixmapCache::find("P1");
     QVERIFY(p3);
     QCOMPARE(p1, *p3);
+#endif
+
+    QVERIFY(QPixmapCache::find("P1", &p2));
+    QCOMPARE(p2.width(), 10);
+    QCOMPARE(p2.height(), 10);
+    QCOMPARE(p1, p2);
 
     //The int part of the API
     QPixmapCache::Key key = QPixmapCache::insert(p1);
@@ -261,6 +278,7 @@ void tst_QPixmapCache::insert()
     }
 
     int num = 0;
+#if QT_DEPRECATED_SINCE(5, 13)
     for (int k = 0; k < numberOfKeys; ++k) {
         if (QPixmapCache::find(QString::number(k)))
             ++num;
@@ -268,6 +286,16 @@ void tst_QPixmapCache::insert()
 
     if (QPixmapCache::find("0"))
         ++num;
+    num = 0;
+#endif
+    QPixmap res;
+    for (int k = 0; k < numberOfKeys; ++k) {
+        if (QPixmapCache::find(QString::number(k), &res))
+            ++num;
+    }
+
+    if (QPixmapCache::find("0", &res))
+        ++num;
 
     QVERIFY(num <= estimatedNum);
     QPixmap p3;
@@ -340,17 +368,17 @@ void tst_QPixmapCache::remove()
     p1.fill(Qt::yellow);
 
     QPixmap p2;
-    QVERIFY(QPixmapCache::find("red", p2));
+    QVERIFY(QPixmapCache::find("red", &p2));
     QVERIFY(p1.toImage() != p2.toImage());
     QVERIFY(p1.toImage() == p1.toImage()); // sanity check
 
     QPixmapCache::remove("red");
-    QVERIFY(!QPixmapCache::find("red"));
+    QVERIFY(!QPixmapCache::find("red", &p2));
     QPixmapCache::remove("red");
-    QVERIFY(!QPixmapCache::find("red"));
+    QVERIFY(!QPixmapCache::find("red", &p2));
 
     QPixmapCache::remove("green");
-    QVERIFY(!QPixmapCache::find("green"));
+    QVERIFY(!QPixmapCache::find("green", &p2));
 
     //The int part of the API
     QPixmapCache::clear();
@@ -392,7 +420,7 @@ void tst_QPixmapCache::remove()
     key = QPixmapCache::insert(p1);
     QPixmapCache::remove(key);
     QVERIFY(QPixmapCache::find(key, &p1) == 0);
-    QVERIFY(QPixmapCache::find("red") != 0);
+    QVERIFY(QPixmapCache::find("red", &p1) != 0);
 }
 
 void tst_QPixmapCache::clear()
@@ -408,14 +436,14 @@ void tst_QPixmapCache::clear()
     const int numberOfKeys = estimatedNum + 1000;
 
     for (int i = 0; i < numberOfKeys; ++i)
-        QVERIFY(QPixmapCache::find("x" + QString::number(i)) == 0);
+        QVERIFY(!QPixmapCache::find("x" + QString::number(i), &p1));
 
     for (int j = 0; j < numberOfKeys; ++j)
         QPixmapCache::insert(QString::number(j), p1);
 
     int num = 0;
     for (int k = 0; k < numberOfKeys; ++k) {
-        if (QPixmapCache::find(QString::number(k), p1))
+        if (QPixmapCache::find(QString::number(k), &p1))
             ++num;
     }
     QVERIFY(num > 0);
@@ -423,7 +451,7 @@ void tst_QPixmapCache::clear()
     QPixmapCache::clear();
 
     for (int k = 0; k < numberOfKeys; ++k)
-        QVERIFY(!QPixmapCache::find(QString::number(k)));
+        QVERIFY(!QPixmapCache::find(QString::number(k), &p1));
 
     //The int part of the API
     QPixmap p2(10, 10);