diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-07-16 15:46:21 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-07-16 15:46:21 (GMT) |
| commit | 6b1b666574d6e27efdd3b243de8815a5278c3666 (patch) | |
| tree | 7a5ac02fe569b3fc497ca8d0a333d10587eb3567 /doc/src/images | |
| parent | eef1d13743baddf41bd135d98fc2ad12944b8477 (diff) | |
| parent | ab4dde176cfa314522964e5e5fbf9f2d388f8fdf (diff) | |
| download | Qt-6b1b666574d6e27efdd3b243de8815a5278c3666.zip Qt-6b1b666574d6e27efdd3b243de8815a5278c3666.tar.gz Qt-6b1b666574d6e27efdd3b243de8815a5278c3666.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/qml-imageprovider-example.png | bin | 0 -> 2259 bytes |
| -rw-r--r-- | doc/src/images/qml-mousearea-example.png | bin | 5527 -> 6969 bytes |
| -rw-r--r-- | doc/src/images/qml-xmllistmodel-example.png | bin | 0 -> 5252 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/qml-imageprovider-example.png b/doc/src/images/qml-imageprovider-example.png Binary files differnew file mode 100644 index 0000000..e82548a --- /dev/null +++ b/doc/src/images/qml-imageprovider-example.png diff --git a/doc/src/images/qml-mousearea-example.png b/doc/src/images/qml-mousearea-example.png Binary files differindex c6e52d6..c0eef7f 100644 --- a/doc/src/images/qml-mousearea-example.png +++ b/doc/src/images/qml-mousearea-example.png diff --git a/doc/src/images/qml-xmllistmodel-example.png b/doc/src/images/qml-xmllistmodel-example.png Binary files differnew file mode 100644 index 0000000..be2d15d --- /dev/null +++ b/doc/src/images/qml-xmllistmodel-example.png |
