diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-03-22 13:03:11 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-03-22 13:03:11 (GMT) |
| commit | acc903853d5ac54d646d324b7386c998bc07d464 (patch) | |
| tree | f2ed3ccc611cebb70a4af7920a0fd0eec4ba5d73 /doc/src/images | |
| parent | 56b4ada44ea5bfa1c4ee669aa00e9ae960965fe3 (diff) | |
| parent | bf95c0ed87bf8a2ccd0a3d57ed81b8ae8fb8c4f2 (diff) | |
| download | Qt-acc903853d5ac54d646d324b7386c998bc07d464.zip Qt-acc903853d5ac54d646d324b7386c998bc07d464.tar.gz Qt-acc903853d5ac54d646d324b7386c998bc07d464.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/examples/qml-examples.qdoc
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/qml-righttoleft-layoutdirection-example.png | bin | 0 -> 23327 bytes |
| -rw-r--r-- | doc/src/images/qml-righttoleft-layoutmirroring-example.png | bin | 0 -> 38982 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/qml-righttoleft-layoutdirection-example.png b/doc/src/images/qml-righttoleft-layoutdirection-example.png Binary files differnew file mode 100644 index 0000000..381ecd7 --- /dev/null +++ b/doc/src/images/qml-righttoleft-layoutdirection-example.png diff --git a/doc/src/images/qml-righttoleft-layoutmirroring-example.png b/doc/src/images/qml-righttoleft-layoutmirroring-example.png Binary files differnew file mode 100644 index 0000000..992c876 --- /dev/null +++ b/doc/src/images/qml-righttoleft-layoutmirroring-example.png |
