diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-17 23:00:11 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-17 23:00:11 (GMT) |
commit | 7727a0288c1ffb40ecff13e7bfc49ce99b984633 (patch) | |
tree | d94518fa3c56bdfc07f015e2acf779904dbe648d /tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png | |
parent | 569b076bb650c5082109d6406616c7536ac9f79f (diff) | |
parent | cca7c5b40751e2192ba2c7c7422557eeb5672a17 (diff) | |
download | Qt-7727a0288c1ffb40ecff13e7bfc49ce99b984633.zip Qt-7727a0288c1ffb40ecff13e7bfc49ce99b984633.tar.gz Qt-7727a0288c1ffb40ecff13e7bfc49ce99b984633.tar.bz2 |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png')
-rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png | bin | 1197 -> 527 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png Binary files differindex 901551e..51018b4 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png |