diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-04-18 15:50:31 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-04-20 15:05:01 +0000 |
commit | 2b40af71770e3c330cf5fd028c8c4fd2ec724eb2 (patch) | |
tree | 567ea91faab69e7eb6dc130fba24673e9de67230 /tests/auto/gui/image/qimagereader | |
parent | 7ee44dcb9c5c4ffaba0043d7d58e0d43ccc06195 (diff) |
tst_qimagereader: Make sure to include all image resources in test
The manually maintained qrc file was missing corrupt_clut.bmp among
others.
Change-Id: I8916ba76a63950de03f25814d893306d046d273d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/gui/image/qimagereader')
-rw-r--r-- | tests/auto/gui/image/qimagereader/qimagereader.pro | 3 | ||||
-rw-r--r-- | tests/auto/gui/image/qimagereader/qimagereader.qrc | 69 |
2 files changed, 2 insertions, 70 deletions
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> |