diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-30 07:30:01 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-30 07:30:01 (GMT) |
| commit | c2bee860f72898c6d57ff9f117256059b3952479 (patch) | |
| tree | 8f190bac91f9cbd11e6e52479a3effea132a3a20 /tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png | |
| parent | de306893b464ed0fa00f98488912fd6269713519 (diff) | |
| parent | c4f59859a589b76419e9133110eda850223f03dd (diff) | |
| download | Qt-c2bee860f72898c6d57ff9f117256059b3952479.zip Qt-c2bee860f72898c6d57ff9f117256059b3952479.tar.gz Qt-c2bee860f72898c6d57ff9f117256059b3952479.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-4.7-from-4.6
Conflicts:
mkspecs/common/symbian/symbian.conf
src/3rdparty/webkit/WebCore/WebCore.pro
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png | bin | 0 -> 1002 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png Binary files differnew file mode 100644 index 0000000..5631a46 --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.0.png |