summaryrefslogtreecommitdiffstats
path: root/doc/src/examples/qml-examples.qdoc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-03 22:52:18 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-03 22:52:18 (GMT)
commitbd3d16fcebdeaf1948e33af9fbf54871aadc5fc5 (patch)
treede8277a0de1bdd74a0ed240596fe1bde735c8f10 /doc/src/examples/qml-examples.qdoc
parenta6c9422dc2103ee439696b24932149c5b08f2db8 (diff)
parentd87e2627cbc3f818e23c9c80b03cc665e5f3d444 (diff)
downloadQt-bd3d16fcebdeaf1948e33af9fbf54871aadc5fc5.zip
Qt-bd3d16fcebdeaf1948e33af9fbf54871aadc5fc5.tar.gz
Qt-bd3d16fcebdeaf1948e33af9fbf54871aadc5fc5.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: (172 commits) Don't accept input methods when a TextEdit or TextInput is read only. Correct error message On windows xp using a higher port makes the declarativedebug* tests work Correct assert Update QDeclarative DEF files for Symbian Export QDeclarativeRefCount so that symbian compiles. Make Flickable's wheel handling more like QAbstractScrollArea. Changing header or footer failed to delete the previous. Avoid index-out-of bounds related crash in Grid Move Qt.application docs into Qt global object page Add initial size to ListView in FolderListModel example update What's New for QtQuick 1.1 and AnimatedImage docs Improve docs on Item::visible and Item::opacity Make sure we update Loader size if item size changes after creation. Froze two more symbols and fixed compilation error (QtQuick11). PinchArea sometimes failed. Froze Symbian def files for QtQuick11. Clarify that IntValidator performs locale specific validation. Add a mouseSelectionMode property to TextEdit and TextInput. Add missing versioning tests for new QtQuick 1.1 properties/methods. ...
Diffstat (limited to 'doc/src/examples/qml-examples.qdoc')
-rw-r--r--doc/src/examples/qml-examples.qdoc18
1 files changed, 14 insertions, 4 deletions
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 46af110..2dc45e3 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -270,16 +270,26 @@
*/
/*!
- \title Positioners Example
- \example declarative/positioners
+ \title Positioners: Adding and Removing Items Example
+ \example declarative/positioners/addandremove
- This example shows how to use positioner elements such as \l Row, \l Column,
- \l Grid and \l Flow.
+ This example shows how to use the positioner elements such as \l Row, \l Column,
+ \l Grid and \l Flow, in particular how to add and remove items with appropriate transitions.
\image qml-positioners-example.png
*/
/*!
+ \title Positioners: Layout Direction Example
+ \example declarative/positioners/layoutdirection
+
+ This example shows how to control the horizontal layout direction of
+ \l Row, \l Grid and \l Flow positioners.
+
+ \image qml-positioners-layoutdirection-example.png
+*/
+
+/*!
\title Key Interaction: Focus Example
\example declarative/keyinteraction/focus