diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-21 17:19:13 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-21 17:19:13 (GMT) |
| commit | 9afac62064df735fa4667f61ce4fbda5289c94d9 (patch) | |
| tree | e7efcbb0791edc84ac167697f9642f0991da2c5b /doc/src/examples | |
| parent | d8b3a29279ff71a6415074872ec97dad6622c03d (diff) | |
| download | Qt-9afac62064df735fa4667f61ce4fbda5289c94d9.zip Qt-9afac62064df735fa4667f61ce4fbda5289c94d9.tar.gz Qt-9afac62064df735fa4667f61ce4fbda5289c94d9.tar.bz2 | |
Removed GestureArea link from the elements page.
Additional merge conflicts fix.
Reviewed-by: David Boddie
Diffstat (limited to 'doc/src/examples')
| -rw-r--r-- | doc/src/examples/qml-examples.qdoc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc index 85b87ea..f77464f 100644 --- a/doc/src/examples/qml-examples.qdoc +++ b/doc/src/examples/qml-examples.qdoc @@ -283,7 +283,7 @@ \title Positioners: Layout Direction Example \example declarative/positioners/layoutdirection - This example shows how to control the horizontal layout direction of + 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 @@ -583,13 +583,6 @@ */ /*! - \title Touch Interaction: Gestures Example - \example declarative/touchinteraction/gestures - - This example shows how to use the GestureArea element. -*/ - -/*! \title Touch Interaction: MouseArea Example \example declarative/touchinteraction/mousearea |