Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp
index aadee5b..7e57973 100644
--- a/tests/auto/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/qimagereader/tst_qimagereader.cpp
@@ -138,6 +138,9 @@ private slots:
     void sizeBeforeRead_data();
     void sizeBeforeRead();
 
+    void sizeBeforeFormat_data();
+    void sizeBeforeFormat();
+
     void imageFormatBeforeRead_data();
     void imageFormatBeforeRead();
 
@@ -706,6 +709,31 @@ void tst_QImageReader::sizeBeforeRead()
     QCOMPARE(size, image.size());
 }
 
+void tst_QImageReader::sizeBeforeFormat_data()
+{
+    imageFormat_data();
+}
+
+void tst_QImageReader::sizeBeforeFormat()
+{
+    QFETCH(QString, fileName);
+
+    QByteArray formatA, formatB;
+
+    {
+        QImageReader reader(prefix + fileName);
+        formatA = reader.format();
+    }
+
+    {
+        QImageReader reader(prefix + fileName);
+        QSize size = reader.size();
+        formatB = reader.format();
+    }
+
+    QCOMPARE(formatA, formatB);
+}
+
 void tst_QImageReader::imageFormatBeforeRead_data()
 {
     imageFormat_data();