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/declarative | |
| 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/declarative')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index ff8e201..873d0de 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -77,7 +77,6 @@ To see the QML elements listed by functional area, see the \o \l {FocusScope} - Element that mediate keyboard focus changes \o \l {Flickable} - Provides a surface that can be "flicked" \o \l {Flipable} - Provides a surface that produces "flipping" effects -\o \l {GestureArea} - Enables simple gesture handling \endlist \section1 Positioners and Repeater |