diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-21 04:55:49 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-21 04:55:49 (GMT) |
commit | fd110f31ce6b50b5258e6066073276a858fb88cd (patch) | |
tree | 00f85d50005277351d5a60730c8d62ba94109c50 /doc/src/images | |
parent | c08eed6bec191364a31aecbf5cf33277c637bd7e (diff) | |
parent | 40db21b1d8a020291f0a0660d30491b49f49885b (diff) | |
download | Qt-fd110f31ce6b50b5258e6066073276a858fb88cd.zip Qt-fd110f31ce6b50b5258e6066073276a858fb88cd.tar.gz Qt-fd110f31ce6b50b5258e6066073276a858fb88cd.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
fixes/improvements for new QML right-to-left docs
Fix license headers in example code
Write Qt Quick 1.1 right-to-left documentation and examples
Doc fix - QtQuick 1.1 scheduling
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 |