diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-27 14:22:55 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-27 14:22:55 (GMT) |
| commit | 3f626c3e14f2fe5fdecc38d4265d74f8315b3490 (patch) | |
| tree | 357b32156e211a33841e44b7a224313c7072ee46 /tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.1.png | |
| parent | 57ce77e953b618739f6f1aec67f8e0de97e05b08 (diff) | |
| parent | 6396e7a15079cb157caef319348a0bcd0b95a6a7 (diff) | |
| download | Qt-3f626c3e14f2fe5fdecc38d4265d74f8315b3490.zip Qt-3f626c3e14f2fe5fdecc38d4265d74f8315b3490.tar.gz Qt-3f626c3e14f2fe5fdecc38d4265d74f8315b3490.tar.bz2 | |
Merge remote branch 'origin/master' into 4.7
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/declarative/graphicsitems/qdeclarativeevents.cpp
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/qml/qdeclarativescript.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativebehavior.cpp
src/declarative/util/qdeclarativeeasefollow.cpp
src/declarative/util/qdeclarativefontloader.cpp
src/declarative/util/qdeclarativelistmodel.cpp
src/declarative/util/qdeclarativespringfollow.cpp
src/declarative/util/qdeclarativestategroup.cpp
src/declarative/util/qdeclarativesystempalette.cpp
src/declarative/util/qdeclarativetimer.cpp
src/declarative/util/qmlstateoperations.cpp
src/multimedia/qml/qdeclarativeaudio.cpp
src/multimedia/qml/qdeclarativevideo.cpp
Diffstat (limited to 'tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.1.png')
| -rw-r--r-- | tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.1.png | bin | 0 -> 1110 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.1.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.1.png Binary files differnew file mode 100644 index 0000000..ec65f49 --- /dev/null +++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.1.png |