9 files changed, 12 insertions, 70 deletions
diff --git a/tests/auto/gui/image/qimagereader/images/basn0g16.png b/tests/auto/gui/image/qimagereader/images/basn0g16.png
new file mode 100644
index 0000000000..318ebcadf4
--- /dev/null
+++ b/tests/auto/gui/image/qimagereader/images/basn0g16.png
diff --git a/tests/auto/gui/image/qimagereader/images/basn2c16.png b/tests/auto/gui/image/qimagereader/images/basn2c16.png
new file mode 100644
index 0000000000..1bd4a4d0e2
--- /dev/null
+++ b/tests/auto/gui/image/qimagereader/images/basn2c16.png
diff --git a/tests/auto/gui/image/qimagereader/images/basn4a16.png b/tests/auto/gui/image/qimagereader/images/basn4a16.png
new file mode 100644
index 0000000000..6dbee9fbdb
--- /dev/null
+++ b/tests/auto/gui/image/qimagereader/images/basn4a16.png
diff --git a/tests/auto/gui/image/qimagereader/images/basn6a16.png b/tests/auto/gui/image/qimagereader/images/basn6a16.png
new file mode 100644
index 0000000000..a9bf3cb461
--- /dev/null
+++ b/tests/auto/gui/image/qimagereader/images/basn6a16.png
diff --git a/tests/auto/gui/image/qimagereader/images/kollada-16bpc.png b/tests/auto/gui/image/qimagereader/images/kollada-16bpc.png
new file mode 100644
index 0000000000..b99d5f8a6f
--- /dev/null
+++ b/tests/auto/gui/image/qimagereader/images/kollada-16bpc.png
diff --git a/tests/auto/gui/image/qimagereader/images/tbwn0g16.png b/tests/auto/gui/image/qimagereader/images/tbwn0g16.png
new file mode 100644
index 0000000000..99bdeed2b3
--- /dev/null
+++ b/tests/auto/gui/image/qimagereader/images/tbwn0g16.png
diff --git a/tests/auto/gui/image/qimagereader/qimagereader.pro b/tests/auto/gui/image/qimagereader/qimagereader.pro
index b06f56dddf..623d45ffe2 100644
--- a/tests/auto/gui/image/qimagereader/qimagereader.pro
+++ b/tests/auto/gui/image/qimagereader/qimagereader.pro
@@ -3,7 +3,8 @@ TARGET = tst_qimagereader
 SOURCES += tst_qimagereader.cpp
 MOC_DIR=tmp
 QT += core-private gui-private network testlib
-RESOURCES += qimagereader.qrc
+
+RESOURCES += $$files(images/*)
 
 android:!android-embedded {
     RESOURCES += android_testdata.qrc
diff --git a/tests/auto/gui/image/qimagereader/qimagereader.qrc b/tests/auto/gui/image/qimagereader/qimagereader.qrc
deleted file mode 100644
index 2522154b1f..0000000000
--- a/tests/auto/gui/image/qimagereader/qimagereader.qrc
+++ /dev/null
@@ -1,69 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>images/16bpp.bmp</file>
-        <file>images/4bpp-rle.bmp</file>
-        <file>images/YCbCr_cmyk.jpg</file>
-        <file>images/YCbCr_cmyk.png</file>
-        <file>images/YCbCr_rgb.jpg</file>
-        <file>images/away.png</file>
-        <file>images/bat1.gif</file>
-        <file>images/bat2.gif</file>
-        <file>images/beavis.jpg</file>
-        <file>images/black.png</file>
-        <file>images/black.xpm</file>
-        <file>images/colorful.bmp</file>
-        <file>images/corrupt-colors.xpm</file>
-        <file>images/corrupt-pixels.xpm</file>
-        <file>images/corrupt.bmp</file>
-        <file>images/corrupt.gif</file>
-        <file>images/corrupt.jpg</file>
-        <file>images/corrupt.png</file>
-        <file>images/corrupt.xbm</file>
-        <file>images/crash-signed-char.bmp</file>
-        <file>images/earth.gif</file>
-        <file>images/font.bmp</file>
-        <file>images/gnus.xbm</file>
-        <file>images/image.pbm</file>
-        <file>images/image.pgm</file>
-        <file>images/image.png</file>
-        <file>images/image.ppm</file>
-        <file>images/kollada.png</file>
-        <file>images/marble.xpm</file>
-        <file>images/namedcolors.xpm</file>
-        <file>images/negativeheight.bmp</file>
-        <file>images/noclearcode.bmp</file>
-        <file>images/noclearcode.gif</file>
-        <file>images/nontransparent.xpm</file>
-        <file>images/rgb32bf.bmp</file>
-        <file>images/runners.ppm</file>
-        <file>images/teapot.ppm</file>
-        <file>images/test.ppm</file>
-        <file>images/test.xpm</file>
-        <file>images/test32bfv4.bmp</file>
-        <file>images/test32v5.bmp</file>
-        <file>images/tst7.bmp</file>
-        <file>images/tst7.png</file>
-        <file>images/transparent.xpm</file>
-        <file>images/trolltech.gif</file>
-        <file>images/qt.gif</file>
-        <file>images/qt1.gif</file>
-        <file>images/qt2.gif</file>
-        <file>images/qt3.gif</file>
-        <file>images/qt4.gif</file>
-        <file>images/qt5.gif</file>
-        <file>images/qt6.gif</file>
-        <file>images/qt7.gif</file>
-        <file>images/qt8.gif</file>
-        <file>images/endless-anim.gif</file>
-        <file>images/four-frames.gif</file>
-        <file>images/qt-gif-anim.gif</file>
-        <file>images/qt-gif-noanim.gif</file>
-        <file>images/rect.svg</file>
-        <file>images/rect.svgz</file>
-        <file>images/corrupt.svg</file>
-        <file>images/corrupt.svgz</file>
-        <file>images/qtbug13653-no_eoi.jpg</file>
-        <file>images/txts.jpg</file>
-        <file>images/txts.png</file>
-    </qresource>
-</RCC>
diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index 170f551dbf..c2ec5b8925 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -234,6 +234,7 @@ void tst_QImageReader::readImage_data()
     QTest::newRow("BMP: high mask bit set") << QString("rgb32bf.bmp") << true << QByteArray("bmp");
     QTest::newRow("XPM: marble") << QString("marble.xpm") << true << QByteArray("xpm");
     QTest::newRow("PNG: kollada") << QString("kollada.png") << true << QByteArray("png");
+    QTest::newRow("PNG: kollada 16bpc") << QString("kollada-16bpc.png") << true << QByteArray("png");
     QTest::newRow("PPM: teapot") << QString("teapot.ppm") << true << QByteArray("ppm");
     QTest::newRow("PPM: runners") << QString("runners.ppm") << true << QByteArray("ppm");
     QTest::newRow("PPM: test") << QString("test.ppm") << true << QByteArray("ppm");
@@ -523,6 +524,12 @@ void tst_QImageReader::imageFormat_data()
     QTest::newRow("bmp-4") << QString("test32v5.bmp") << QByteArray("bmp") << QImage::Format_RGB32;
     QTest::newRow("png") << QString("kollada.png") << QByteArray("png") << QImage::Format_ARGB32;
     QTest::newRow("png-2") << QString("YCbCr_cmyk.png") << QByteArray("png") << QImage::Format_RGB32;
+    QTest::newRow("png-3") << QString("kollada-16bpc.png") << QByteArray("png") << QImage::Format_RGBA64;
+    QTest::newRow("png-4") << QString("basn0g16.png") << QByteArray("png") << QImage::Format_RGBX64; // Grayscale16
+    QTest::newRow("png-5") << QString("basn2c16.png") << QByteArray("png") << QImage::Format_RGBX64;
+    QTest::newRow("png-6") << QString("basn4a16.png") << QByteArray("png") << QImage::Format_RGBA64; // Grayscale16Alpha16
+    QTest::newRow("png-7") << QString("basn6a16.png") << QByteArray("png") << QImage::Format_RGBA64;
+    QTest::newRow("png-8") << QString("tbwn0g16.png") << QByteArray("png") << QImage::Format_RGBA64; // Grayscale16+tRNS
     QTest::newRow("svg") << QString("rect.svg") << QByteArray("svg") << QImage::Format_ARGB32_Premultiplied;
     QTest::newRow("svgz") << QString("rect.svgz") << QByteArray("svgz") << QImage::Format_ARGB32_Premultiplied;
 }
@@ -1596,6 +1603,7 @@ void tst_QImageReader::supportsOption_data()
                          << (QIntList() << QImageIOHandler::Gamma
                               << QImageIOHandler::Description
                               << QImageIOHandler::Quality
+                              << QImageIOHandler::CompressionRatio
                               << QImageIOHandler::Size
                               << QImageIOHandler::ScaledSize);
 }
@@ -1850,6 +1858,8 @@ void tst_QImageReader::saveFormat_data()
     QTest::newRow("Format_RGB888") << QImage::Format_RGB888;
     QTest::newRow("Format_RGB444") << QImage::Format_RGB444;
     QTest::newRow("Format_ARGB4444_Premultiplied") << QImage::Format_ARGB4444_Premultiplied;
+    QTest::newRow("Format_RGBA64") << QImage::Format_RGBA64;
+    QTest::newRow("Format_RGBA64_Premultiplied") << QImage::Format_RGBA64_Premultiplied;
 }
 
 void tst_QImageReader::saveFormat()