Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp
index f5313eb..0b32f0a 100644
--- a/tests/auto/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/qimagereader/tst_qimagereader.cpp
@@ -156,6 +156,9 @@ private slots:
 
     void pixelCompareWithBaseline_data();
     void pixelCompareWithBaseline();
+
+    void task255627_setNullScaledSize_data();
+    void task255627_setNullScaledSize();
 };
 
 static const QLatin1String prefix(SRCDIR "/images/");
@@ -333,6 +336,29 @@ void tst_QImageReader::setScaledSize()
     QCOMPARE(image.size(), newSize);
 }
 
+void tst_QImageReader::task255627_setNullScaledSize_data()
+{
+    setScaledSize_data();
+}
+
+void tst_QImageReader::task255627_setNullScaledSize()
+{
+    QFETCH(QString, fileName);
+    QFETCH(QByteArray, format);
+
+    if (!format.isEmpty() && !QImageReader::supportedImageFormats().contains(format))
+        QSKIP("Qt does not support reading the \"" + format + "\" format", SkipSingle);
+
+    QImageReader reader(prefix + fileName);
+
+    // set a null size
+    reader.setScaledSize(QSize(0, 0));
+    reader.setQuality(0);
+    QImage image = reader.read();
+    QVERIFY(image.isNull());
+    QCOMPARE(image.size(), QSize(0, 0));
+}
+
 void tst_QImageReader::setClipRect_data()
 {
     QTest::addColumn<QString>("fileName");