diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-07 14:45:09 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-07 14:45:09 (GMT) |
| commit | d7a91cfe8683309883694fbbf508e5fc42d44165 (patch) | |
| tree | 95e248d34d10015778f7a00477c59e265501d443 /tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.0.png | |
| parent | b7aa20e56b3ed45cf00d8a57696e6d8ac803f9b4 (diff) | |
| parent | c39b3d42dda26b1f9576906cd001236c9d96e06a (diff) | |
| download | Qt-d7a91cfe8683309883694fbbf508e5fc42d44165.zip Qt-d7a91cfe8683309883694fbbf508e5fc42d44165.tar.gz Qt-d7a91cfe8683309883694fbbf508e5fc42d44165.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Conflicts:
doc/src/declarative/propertybinding.qdoc
src/declarative/util/qdeclarativeview.cpp
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.0.png')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.0.png | bin | 0 -> 609 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.0.png Binary files differnew file mode 100644 index 0000000..7d0d0ae --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.0.png |