diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-03-22 15:55:52 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-03-22 15:55:52 (GMT) |
| commit | 1d8b7f41a5393f77eb3079513b083739edd90b91 (patch) | |
| tree | 232e346dba7226f35af80043e072538dba473201 /doc/src/images | |
| parent | 624368f588e555f523fc507986bf3ec80681be48 (diff) | |
| parent | bf95c0ed87bf8a2ccd0a3d57ed81b8ae8fb8c4f2 (diff) | |
| download | Qt-1d8b7f41a5393f77eb3079513b083739edd90b91.zip Qt-1d8b7f41a5393f77eb3079513b083739edd90b91.tar.gz Qt-1d8b7f41a5393f77eb3079513b083739edd90b91.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/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.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 |
