aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:24:27 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:24:27 +0200
commit6d019d276a4be4e1a20eaf41a16eca64007249f3 (patch)
treee85a4b5eecf47a3b4dfa0f8353af2ed84120f1d0 /tests
parentdcb06c7880b89530f3fbbb6bbe519d203dce517d (diff)
parente7d198e87396eb160fa9b1163eb73af152e70da2 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qpixmap/data/icon_8bpp_16x16.pngbin1454 -> 1335 bytes
-rw-r--r--tests/auto/qpixmap/data/icon_8bpp_32x32.pngbin1721 -> 1577 bytes
-rw-r--r--tests/auto/qpixmap/data/icon_8bpp_48x48.pngbin1967 -> 1778 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/qpixmap/data/icon_8bpp_16x16.png b/tests/auto/qpixmap/data/icon_8bpp_16x16.png
index e9a995e..03b1a65 100644
--- a/tests/auto/qpixmap/data/icon_8bpp_16x16.png
+++ b/tests/auto/qpixmap/data/icon_8bpp_16x16.png
Binary files differ
diff --git a/tests/auto/qpixmap/data/icon_8bpp_32x32.png b/tests/auto/qpixmap/data/icon_8bpp_32x32.png
index 41ef57f..0ef47c5 100644
--- a/tests/auto/qpixmap/data/icon_8bpp_32x32.png
+++ b/tests/auto/qpixmap/data/icon_8bpp_32x32.png
Binary files differ
diff --git a/tests/auto/qpixmap/data/icon_8bpp_48x48.png b/tests/auto/qpixmap/data/icon_8bpp_48x48.png
index 35d60d1..2060854 100644
--- a/tests/auto/qpixmap/data/icon_8bpp_48x48.png
+++ b/tests/auto/qpixmap/data/icon_8bpp_48x48.png
Binary files differ