diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-04 08:59:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-04 08:59:18 +0200 |
| commit | 216f57ef8682f74b72ae4e39cf1fd23abddf6a51 (patch) | |
| tree | 9d1dc12e0944ec0252dac843fbadaf1dc4693888 /tests/auto/gui/image/qpixmap | |
| parent | 36bc2477753d19a14c587b97d4ec4f263e9e16c0 (diff) | |
| parent | 8ce657d0279566ef327af1b88339534041ddc012 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I35ca979395620e104e50b06366d0869433a4ffc2
Diffstat (limited to 'tests/auto/gui/image/qpixmap')
| -rw-r--r-- | tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_16x16.png | bin | 1454 -> 1335 bytes |
| -rw-r--r-- | tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_32x32.png | bin | 1721 -> 1577 bytes |
| -rw-r--r-- | tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_48x48.png | bin | 1967 -> 1778 bytes |
| -rw-r--r-- | tests/auto/gui/image/qpixmap/loadFromData/designer_argb32.png | bin | 4189 -> 2874 bytes |
| -rw-r--r-- | tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.png | bin | 2431 -> 2365 bytes |
| -rw-r--r-- | tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.png | bin | 1405 -> 1339 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_16x16.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_16x16.png Binary files differindex e9a995e19e..03b1a65f70 100644 --- a/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_16x16.png +++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_16x16.png diff --git a/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_32x32.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_32x32.png Binary files differindex 41ef57f94d..0ef47c556d 100644 --- a/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_32x32.png +++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_32x32.png diff --git a/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_48x48.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_48x48.png Binary files differindex 35d60d138b..2060854802 100644 --- a/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_48x48.png +++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_48x48.png diff --git a/tests/auto/gui/image/qpixmap/loadFromData/designer_argb32.png b/tests/auto/gui/image/qpixmap/loadFromData/designer_argb32.png Binary files differindex 55d8247cfc..a35316b9c9 100644 --- a/tests/auto/gui/image/qpixmap/loadFromData/designer_argb32.png +++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_argb32.png diff --git a/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.png b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.png Binary files differindex 28cd2f06d1..3dd2115df1 100644 --- a/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.png +++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.png diff --git a/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.png b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.png Binary files differindex 09735a9752..99cbf4f13a 100644 --- a/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.png +++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.png |
