summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:23:40 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:23:40 +0200
commit4b77b044b3e0a27f9f7501e6a78121afc270619c (patch)
treee73fbe5865c60494f3b3f847b7385e76d05e3804 /tests
parentc24118685d6eb4cacf5f6af96215ba89ecc28604 (diff)
parenta2963fe162921c0abb2116aec6263204954030ad (diff)
downloadqtquickcontrols-4b77b044b3e0a27f9f7501e6a78121afc270619c.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: Ic78345c599719f3dd80b1d6a6004d46a085da4af
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/activeFocusOnTab/data/images/testIcon.pngbin3826 -> 3755 bytes
-rw-r--r--tests/manual/images/checkered.pngbin258 -> 113 bytes
-rw-r--r--tests/manual/images/testIcon.pngbin3826 -> 3755 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/activeFocusOnTab/data/images/testIcon.png b/tests/auto/activeFocusOnTab/data/images/testIcon.png
index 7ac5f840..82e429dd 100644
--- a/tests/auto/activeFocusOnTab/data/images/testIcon.png
+++ b/tests/auto/activeFocusOnTab/data/images/testIcon.png
Binary files differ
diff --git a/tests/manual/images/checkered.png b/tests/manual/images/checkered.png
index 12c8b54b..c34d5260 100644
--- a/tests/manual/images/checkered.png
+++ b/tests/manual/images/checkered.png
Binary files differ
diff --git a/tests/manual/images/testIcon.png b/tests/manual/images/testIcon.png
index 7ac5f840..82e429dd 100644
--- a/tests/manual/images/testIcon.png
+++ b/tests/manual/images/testIcon.png
Binary files differ