diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /tests/auto/widgets/widgets/qtextedit | |
parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'tests/auto/widgets/widgets/qtextedit')
-rw-r--r-- | tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-fully-selected.png | bin | 1232 -> 1247 bytes |
-rw-r--r-- | tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-partly-selected.png | bin | 1231 -> 1246 bytes |
-rw-r--r-- | tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-line.png | bin | 1226 -> 1241 bytes |
-rw-r--r-- | tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-parag.png | bin | 1223 -> 1238 bytes |
-rw-r--r-- | tests/auto/widgets/widgets/qtextedit/fullWidthSelection/multiple-full-width-lines.png | bin | 1236 -> 1250 bytes |
-rw-r--r-- | tests/auto/widgets/widgets/qtextedit/fullWidthSelection/nowrap_long.png | bin | 1199 -> 1214 bytes |
-rw-r--r-- | tests/auto/widgets/widgets/qtextedit/fullWidthSelection/single-full-width-line.png | bin | 1225 -> 1240 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-fully-selected.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-fully-selected.png Binary files differindex ced6eb6e5b..b9df19eeb3 100644 --- a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-fully-selected.png +++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-fully-selected.png diff --git a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-partly-selected.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-partly-selected.png Binary files differindex 481b99c7fc..792593ff12 100644 --- a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-partly-selected.png +++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-partly-selected.png diff --git a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-line.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-line.png Binary files differindex 292d3f9d4c..02e5e93380 100644 --- a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-line.png +++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-line.png diff --git a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-parag.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-parag.png Binary files differindex 69b72ede09..5ef32d2d19 100644 --- a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-parag.png +++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-parag.png diff --git a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/multiple-full-width-lines.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/multiple-full-width-lines.png Binary files differindex 467b91e6e0..d877e1b656 100644 --- a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/multiple-full-width-lines.png +++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/multiple-full-width-lines.png diff --git a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/nowrap_long.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/nowrap_long.png Binary files differindex cce921b0cc..411c0859aa 100644 --- a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/nowrap_long.png +++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/nowrap_long.png diff --git a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/single-full-width-line.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/single-full-width-line.png Binary files differindex 937494ac3c..55d060af1f 100644 --- a/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/single-full-width-line.png +++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/single-full-width-line.png |