diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-03-04 02:53:48 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2011-03-04 02:53:48 (GMT) |
| commit | 94bf3f5acd1342687c55fc5d82077ca89d59b633 (patch) | |
| tree | 82b478367169242b76b83eb3c20e64184b12544b /doc | |
| parent | 6aaf7b3c93687b857ff7cac0f2ad2ee510b2813b (diff) | |
| parent | 818d3e56bda4829398ceb633a7271c5c99fcdbda (diff) | |
| download | Qt-94bf3f5acd1342687c55fc5d82077ca89d59b633.zip Qt-94bf3f5acd1342687c55fc5d82077ca89d59b633.tar.gz Qt-94bf3f5acd1342687c55fc5d82077ca89d59b633.tar.bz2 | |
Merge branch '4.7' into qtquick11
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/declarative/qmlinuse.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 466b940..e2d9350 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -76,7 +76,7 @@ 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 +\o \l {PinchArea} - Enables simple pinch gesture handling \endlist \section1 Positioners and Repeater diff --git a/doc/src/declarative/qmlinuse.qdoc b/doc/src/declarative/qmlinuse.qdoc index 7380ef5..131be1b 100644 --- a/doc/src/declarative/qmlinuse.qdoc +++ b/doc/src/declarative/qmlinuse.qdoc @@ -207,7 +207,7 @@ <li><a href="qml-flipable.html">Flipable Element</a> - The Flipable item provides a surface that can be flipped or reflected.</li> <li><a href="qml-focuspanel.html">FocusPanel Element</a> - The FocusPanel item explicitly creates a focus panel.</li> <li><a href="qml-focusscope.html">FocusScope Element</a> - The FocusScope object explicitly creates a focus scope for focus management.</li> - <li><a href="qml-gesturearea.html">GestureArea Element</a> - The GestureArea item enables simple gesture handling.</li> + <li><a href="qml-pincharea.html">PinchArea Element</a> - The PinchArea item enables simple pinch gesture handling.</li> <li><a href="qml-keynavigation.html">KeyNavigation Element</a> - The KeyNavigation attached property supports key navigation by arrow keys.</li> <li><a href="qml-keys.html">Keys Element</a> - The Keys attached property provides key handling to Items.</li> <li><a href="qml-mousearea.html">MouseArea Element</a> - The MouseArea item enables simple mouse handling.</li> |