diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 13:49:52 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-21 11:10:14 +0100 |
| commit | b6191b16d41459ed73cea738dfaf8e25e81ae22b (patch) | |
| tree | 6ad0952af507bf1ab8df9612023d6e224db8d7e2 /tests/auto/gui/image/qimage/qimage.qrc | |
| parent | b2883a6acc7a8d8372a815cc91dd1a8449f25723 (diff) | |
| parent | 9087df6bd2dd5198ccf101a237aadee331e51ec3 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/global/global.pri
src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.h
src/corelib/tools/qdatetime.cpp
src/plugins/platforms/xcb/qxcbscreen.h
src/plugins/platforms/xcb/qxcbwindow.h
src/widgets/dialogs/qcolordialog.cpp
src/widgets/dialogs/qcolordialog_p.h
tools/configure/configureapp.cpp
Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af
Diffstat (limited to 'tests/auto/gui/image/qimage/qimage.qrc')
| -rw-r--r-- | tests/auto/gui/image/qimage/qimage.qrc | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/tests/auto/gui/image/qimage/qimage.qrc b/tests/auto/gui/image/qimage/qimage.qrc new file mode 100644 index 0000000000..e5de27faf8 --- /dev/null +++ b/tests/auto/gui/image/qimage/qimage.qrc @@ -0,0 +1,22 @@ +<RCC> + <qresource prefix="/"> + <file>images/image.bmp</file> + <file>images/image.gif</file> + <file>images/image.ico</file> + <file>images/image.jpg</file> + <file>images/image.pbm</file> + <file>images/image.pgm</file> + <file>images/image.png</file> + <file>images/image.ppm</file> + <file>images/image.xbm</file> + <file>images/image.xpm</file> + <file>images/jpeg_exif_orientation_value_1.jpg</file> + <file>images/jpeg_exif_orientation_value_2.jpg</file> + <file>images/jpeg_exif_orientation_value_3.jpg</file> + <file>images/jpeg_exif_orientation_value_4.jpg</file> + <file>images/jpeg_exif_orientation_value_5.jpg</file> + <file>images/jpeg_exif_orientation_value_6.jpg</file> + <file>images/jpeg_exif_orientation_value_7.jpg</file> + <file>images/jpeg_exif_orientation_value_8.jpg</file> + </qresource> +</RCC> |