diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-30 12:00:12 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-30 12:00:12 (GMT) |
| commit | 6edbe2ba4fd231d2fb9de25b861b3e25160ed8ca (patch) | |
| tree | a44b65b76e5816f1e0a9a4efa0672b8a6e59a0cc /tests/auto/qtextedit/fullWidthSelection | |
| parent | 5e95f9c3c224b87840e750d4280806a40ed40c92 (diff) | |
| parent | 85b7896a47f9bb622b394107769cb7c1121a6995 (diff) | |
| download | Qt-6edbe2ba4fd231d2fb9de25b861b3e25160ed8ca.zip Qt-6edbe2ba4fd231d2fb9de25b861b3e25160ed8ca.tar.gz Qt-6edbe2ba4fd231d2fb9de25b861b3e25160ed8ca.tar.bz2 | |
Merge commit 'widget/4.6' into origin/4.6
Conflicts:
src/gui/effects/qgraphicseffect.cpp
Diffstat (limited to 'tests/auto/qtextedit/fullWidthSelection')
| -rw-r--r-- | tests/auto/qtextedit/fullWidthSelection/centered-fully-selected.png | bin | 1232 -> 1232 bytes |
| -rw-r--r-- | tests/auto/qtextedit/fullWidthSelection/centered-partly-selected.png | bin | 1231 -> 1231 bytes |
| -rw-r--r-- | tests/auto/qtextedit/fullWidthSelection/last-char-on-line.png | bin | 1220 -> 1226 bytes |
| -rw-r--r-- | tests/auto/qtextedit/fullWidthSelection/last-char-on-parag.png | bin | 1222 -> 1223 bytes |
| -rw-r--r-- | tests/auto/qtextedit/fullWidthSelection/multiple-full-width-lines.png | bin | 1236 -> 1236 bytes |
| -rw-r--r-- | tests/auto/qtextedit/fullWidthSelection/nowrap_long.png | bin | 1199 -> 1199 bytes |
| -rw-r--r-- | tests/auto/qtextedit/fullWidthSelection/single-full-width-line.png | bin | 1235 -> 1225 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/qtextedit/fullWidthSelection/centered-fully-selected.png b/tests/auto/qtextedit/fullWidthSelection/centered-fully-selected.png Binary files differindex 7467478..ced6eb6 100644 --- a/tests/auto/qtextedit/fullWidthSelection/centered-fully-selected.png +++ b/tests/auto/qtextedit/fullWidthSelection/centered-fully-selected.png diff --git a/tests/auto/qtextedit/fullWidthSelection/centered-partly-selected.png b/tests/auto/qtextedit/fullWidthSelection/centered-partly-selected.png Binary files differindex 7a10e63..481b99c 100644 --- a/tests/auto/qtextedit/fullWidthSelection/centered-partly-selected.png +++ b/tests/auto/qtextedit/fullWidthSelection/centered-partly-selected.png diff --git a/tests/auto/qtextedit/fullWidthSelection/last-char-on-line.png b/tests/auto/qtextedit/fullWidthSelection/last-char-on-line.png Binary files differindex df5b92e..292d3f9 100644 --- a/tests/auto/qtextedit/fullWidthSelection/last-char-on-line.png +++ b/tests/auto/qtextedit/fullWidthSelection/last-char-on-line.png diff --git a/tests/auto/qtextedit/fullWidthSelection/last-char-on-parag.png b/tests/auto/qtextedit/fullWidthSelection/last-char-on-parag.png Binary files differindex d58d4cc..69b72ed 100644 --- a/tests/auto/qtextedit/fullWidthSelection/last-char-on-parag.png +++ b/tests/auto/qtextedit/fullWidthSelection/last-char-on-parag.png diff --git a/tests/auto/qtextedit/fullWidthSelection/multiple-full-width-lines.png b/tests/auto/qtextedit/fullWidthSelection/multiple-full-width-lines.png Binary files differindex c5c3c22..467b91e 100644 --- a/tests/auto/qtextedit/fullWidthSelection/multiple-full-width-lines.png +++ b/tests/auto/qtextedit/fullWidthSelection/multiple-full-width-lines.png diff --git a/tests/auto/qtextedit/fullWidthSelection/nowrap_long.png b/tests/auto/qtextedit/fullWidthSelection/nowrap_long.png Binary files differindex 7ded254..cce921b 100644 --- a/tests/auto/qtextedit/fullWidthSelection/nowrap_long.png +++ b/tests/auto/qtextedit/fullWidthSelection/nowrap_long.png diff --git a/tests/auto/qtextedit/fullWidthSelection/single-full-width-line.png b/tests/auto/qtextedit/fullWidthSelection/single-full-width-line.png Binary files differindex d2fd629..937494a 100644 --- a/tests/auto/qtextedit/fullWidthSelection/single-full-width-line.png +++ b/tests/auto/qtextedit/fullWidthSelection/single-full-width-line.png |
