diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:31:49 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:31:49 +0100 |
| commit | dc62583e8e1f864b8a22fbe79f9fe25ca3a4e9dc (patch) | |
| tree | a522e50dd2622e13de796d15910b3211265322af /tests/auto | |
| parent | a4317a8f2732213d9d804363918e12b39e308ce2 (diff) | |
| parent | 17cc497f16ea5e2d722db422e2c6611e107f62a8 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Change-Id: I4b970036bdb5d312b0dc5cb1bcbd8e161e3d4c7e
Diffstat (limited to 'tests/auto')
34 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png b/tests/auto/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png Binary files differindex 18b7c678..4356af95 100644 --- a/tests/auto/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png +++ b/tests/auto/qquickiconimage/icons/testtheme/16x16/actions/appointment-new.png diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png Binary files differindex c6ceca43..d3134a55 100644 --- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png +++ b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new.png diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png Binary files differindex f380ebb6..250b94b0 100644 --- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png +++ b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/+testselector/appointment-new@2x.png diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png Binary files differindex d676ffd4..04cd010a 100644 --- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png +++ b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new.png diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png Binary files differindex 63ae9ce7..a63bbaf4 100644 --- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png +++ b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/appointment-new@2x.png diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png Binary files differindex 2d876cc1..c17d1664 100644 --- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png +++ b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original.png diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png Binary files differindex c65fbed0..d4411658 100644 --- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png +++ b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-original@2x.png diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png Binary files differindex 220a313d..6f7938e3 100644 --- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png +++ b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted.png diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png Binary files differindex cd66ef69..9215fc42 100644 --- a/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png +++ b/tests/auto/qquickiconimage/icons/testtheme/22x22/actions/color-test-tinted@2x.png diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png b/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png Binary files differindex f380ebb6..250b94b0 100644 --- a/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png +++ b/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/+testselector/appointment-new.png diff --git a/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png b/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png Binary files differindex 63ae9ce7..a63bbaf4 100644 --- a/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png +++ b/tests/auto/qquickiconimage/icons/testtheme/22x22@2/actions/appointment-new.png diff --git a/tests/auto/qquickimaginestyle/control-assets/button-background.9.png b/tests/auto/qquickimaginestyle/control-assets/button-background.9.png Binary files differindex 29bd8d7c..18ec9e6f 100644 --- a/tests/auto/qquickimaginestyle/control-assets/button-background.9.png +++ b/tests/auto/qquickimaginestyle/control-assets/button-background.9.png diff --git a/tests/auto/qquickimaginestyle/test-assets/button-background-1.png b/tests/auto/qquickimaginestyle/test-assets/button-background-1.png Binary files differindex 244b707b..980eec3c 100644 --- a/tests/auto/qquickimaginestyle/test-assets/button-background-1.png +++ b/tests/auto/qquickimaginestyle/test-assets/button-background-1.png diff --git a/tests/auto/qquickimaginestyle/test-assets/button-background-2.png b/tests/auto/qquickimaginestyle/test-assets/button-background-2.png Binary files differindex 54f5ecd8..8e2639d0 100644 --- a/tests/auto/qquickimaginestyle/test-assets/button-background-2.png +++ b/tests/auto/qquickimaginestyle/test-assets/button-background-2.png diff --git a/tests/auto/qquickninepatchimage/data/foo.9.png b/tests/auto/qquickninepatchimage/data/foo.9.png Binary files differindex 51246990..bac09a4d 100644 --- a/tests/auto/qquickninepatchimage/data/foo.9.png +++ b/tests/auto/qquickninepatchimage/data/foo.9.png diff --git a/tests/auto/qquickninepatchimage/data/foo@2x.9.png b/tests/auto/qquickninepatchimage/data/foo@2x.9.png Binary files differindex c8dc30a3..43e4b478 100644 --- a/tests/auto/qquickninepatchimage/data/foo@2x.9.png +++ b/tests/auto/qquickninepatchimage/data/foo@2x.9.png diff --git a/tests/auto/qquickninepatchimage/data/foo@3x.9.png b/tests/auto/qquickninepatchimage/data/foo@3x.9.png Binary files differindex 00ea4e05..4d199c84 100644 --- a/tests/auto/qquickninepatchimage/data/foo@3x.9.png +++ b/tests/auto/qquickninepatchimage/data/foo@3x.9.png diff --git a/tests/auto/qquickninepatchimage/data/foo@4x.9.png b/tests/auto/qquickninepatchimage/data/foo@4x.9.png Binary files differindex ea73340a..018b8341 100644 --- a/tests/auto/qquickninepatchimage/data/foo@4x.9.png +++ b/tests/auto/qquickninepatchimage/data/foo@4x.9.png diff --git a/tests/auto/qquickninepatchimage/data/inset-all.9.png b/tests/auto/qquickninepatchimage/data/inset-all.9.png Binary files differindex e08ef9c7..a1899429 100644 --- a/tests/auto/qquickninepatchimage/data/inset-all.9.png +++ b/tests/auto/qquickninepatchimage/data/inset-all.9.png diff --git a/tests/auto/qquickninepatchimage/data/inset-all@2x.9.png b/tests/auto/qquickninepatchimage/data/inset-all@2x.9.png Binary files differindex 96d1c0e8..d00d719c 100644 --- a/tests/auto/qquickninepatchimage/data/inset-all@2x.9.png +++ b/tests/auto/qquickninepatchimage/data/inset-all@2x.9.png diff --git a/tests/auto/qquickninepatchimage/data/inset-all@3x.9.png b/tests/auto/qquickninepatchimage/data/inset-all@3x.9.png Binary files differindex 215ce27e..6130fd50 100644 --- a/tests/auto/qquickninepatchimage/data/inset-all@3x.9.png +++ b/tests/auto/qquickninepatchimage/data/inset-all@3x.9.png diff --git a/tests/auto/qquickninepatchimage/data/inset-all@4x.9.png b/tests/auto/qquickninepatchimage/data/inset-all@4x.9.png Binary files differindex 35e53101..2c2d1694 100644 --- a/tests/auto/qquickninepatchimage/data/inset-all@4x.9.png +++ b/tests/auto/qquickninepatchimage/data/inset-all@4x.9.png diff --git a/tests/auto/qquickninepatchimage/data/inset-bottomright.9.png b/tests/auto/qquickninepatchimage/data/inset-bottomright.9.png Binary files differindex c4c37dff..2b3e58cb 100644 --- a/tests/auto/qquickninepatchimage/data/inset-bottomright.9.png +++ b/tests/auto/qquickninepatchimage/data/inset-bottomright.9.png diff --git a/tests/auto/qquickninepatchimage/data/inset-bottomright@2x.9.png b/tests/auto/qquickninepatchimage/data/inset-bottomright@2x.9.png Binary files differindex 3d64036f..70aceb61 100644 --- a/tests/auto/qquickninepatchimage/data/inset-bottomright@2x.9.png +++ b/tests/auto/qquickninepatchimage/data/inset-bottomright@2x.9.png diff --git a/tests/auto/qquickninepatchimage/data/inset-bottomright@3x.9.png b/tests/auto/qquickninepatchimage/data/inset-bottomright@3x.9.png Binary files differindex 115184d9..032400ce 100644 --- a/tests/auto/qquickninepatchimage/data/inset-bottomright@3x.9.png +++ b/tests/auto/qquickninepatchimage/data/inset-bottomright@3x.9.png diff --git a/tests/auto/qquickninepatchimage/data/inset-bottomright@4x.9.png b/tests/auto/qquickninepatchimage/data/inset-bottomright@4x.9.png Binary files differindex 2ec7cbef..d5cf85aa 100644 --- a/tests/auto/qquickninepatchimage/data/inset-bottomright@4x.9.png +++ b/tests/auto/qquickninepatchimage/data/inset-bottomright@4x.9.png diff --git a/tests/auto/qquickninepatchimage/data/inset-topleft.9.png b/tests/auto/qquickninepatchimage/data/inset-topleft.9.png Binary files differindex 9cc5f43d..05a2ff70 100644 --- a/tests/auto/qquickninepatchimage/data/inset-topleft.9.png +++ b/tests/auto/qquickninepatchimage/data/inset-topleft.9.png diff --git a/tests/auto/qquickninepatchimage/data/inset-topleft@2x.9.png b/tests/auto/qquickninepatchimage/data/inset-topleft@2x.9.png Binary files differindex a4ca2b12..a88f87a5 100644 --- a/tests/auto/qquickninepatchimage/data/inset-topleft@2x.9.png +++ b/tests/auto/qquickninepatchimage/data/inset-topleft@2x.9.png diff --git a/tests/auto/qquickninepatchimage/data/inset-topleft@3x.9.png b/tests/auto/qquickninepatchimage/data/inset-topleft@3x.9.png Binary files differindex 73f3595a..16349d22 100644 --- a/tests/auto/qquickninepatchimage/data/inset-topleft@3x.9.png +++ b/tests/auto/qquickninepatchimage/data/inset-topleft@3x.9.png diff --git a/tests/auto/qquickninepatchimage/data/inset-topleft@4x.9.png b/tests/auto/qquickninepatchimage/data/inset-topleft@4x.9.png Binary files differindex 78baa463..160fab61 100644 --- a/tests/auto/qquickninepatchimage/data/inset-topleft@4x.9.png +++ b/tests/auto/qquickninepatchimage/data/inset-topleft@4x.9.png diff --git a/tests/auto/qquickninepatchimage/data/padding.9.png b/tests/auto/qquickninepatchimage/data/padding.9.png Binary files differindex 5b4f0960..8a65afad 100644 --- a/tests/auto/qquickninepatchimage/data/padding.9.png +++ b/tests/auto/qquickninepatchimage/data/padding.9.png diff --git a/tests/auto/qquickninepatchimage/data/padding@2x.9.png b/tests/auto/qquickninepatchimage/data/padding@2x.9.png Binary files differindex 44eb1943..101fc0cb 100644 --- a/tests/auto/qquickninepatchimage/data/padding@2x.9.png +++ b/tests/auto/qquickninepatchimage/data/padding@2x.9.png diff --git a/tests/auto/qquickninepatchimage/data/padding@3x.9.png b/tests/auto/qquickninepatchimage/data/padding@3x.9.png Binary files differindex d1563448..e07a93a2 100644 --- a/tests/auto/qquickninepatchimage/data/padding@3x.9.png +++ b/tests/auto/qquickninepatchimage/data/padding@3x.9.png diff --git a/tests/auto/qquickninepatchimage/data/padding@4x.9.png b/tests/auto/qquickninepatchimage/data/padding@4x.9.png Binary files differindex e86cce69..a3506444 100644 --- a/tests/auto/qquickninepatchimage/data/padding@4x.9.png +++ b/tests/auto/qquickninepatchimage/data/padding@4x.9.png |
