diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-04 14:16:35 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-04 14:16:35 (GMT) |
| commit | 84fdd4be15a8fa2ea921a112a05b185ffd59cc04 (patch) | |
| tree | dd4539a6f6eeccb05d02bce338b7f755504dcff6 /doc/src/qt4-intro.qdoc | |
| parent | 245a68a0aad0473fcf56cd75e78b951480d39e2b (diff) | |
| parent | ae1c9def5cb22d88cf10b2a23d06bc38da12725b (diff) | |
| download | Qt-84fdd4be15a8fa2ea921a112a05b185ffd59cc04.zip Qt-84fdd4be15a8fa2ea921a112a05b185ffd59cc04.tar.gz Qt-84fdd4be15a8fa2ea921a112a05b185ffd59cc04.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src/qt4-intro.qdoc')
| -rw-r--r-- | doc/src/qt4-intro.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index 052e1c9..8867fd9 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -597,9 +597,9 @@ See \l{The State Machine Framework} documentation for more information. - \section1 Multi-Touch and Gestures + \section1 Touch and Gestures - Support for multi-touch input enables users to interact with many + Support for touch input enables users to interact with many parts of a user interface at the same time, and provides the basis for gestures. Additional infrastructure for gesture recognition allows a sequence of touch inputs to be combined to create gestures @@ -613,12 +613,12 @@ \list \o Allows users to interact with applications in more natural ways. \o Simplifies finger-based interaction with UI components. - \o Combines support for common basic gestures and multi-touch gestures + \o Combines support for common basic gestures and touch gestures in a single general framework. \o Enables extensibility by design. \endlist - See the QTouchEvent class documentation for more information on multi-touch + See the QTouchEvent class documentation for more information on touch input and QGestureEvent for gestures. \section1 DOM access API |