diff options
author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-07-28 08:55:43 (GMT) |
---|---|---|
committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-07-28 08:55:43 (GMT) |
commit | baaa236128d89f7fcbd63fb14eeacdabd3d64d71 (patch) | |
tree | 4132d435f6bf64a5e6d049c76eeb9604db47a8cc /doc/src/getting-started | |
parent | 583d68c72ae58c1b35c2ffba733b7e68a32dc2f9 (diff) | |
parent | 354bd0287c4178cbf512f10b5624a84c99e1d606 (diff) | |
download | Qt-baaa236128d89f7fcbd63fb14eeacdabd3d64d71.zip Qt-baaa236128d89f7fcbd63fb14eeacdabd3d64d71.tar.gz Qt-baaa236128d89f7fcbd63fb14eeacdabd3d64d71.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'doc/src/getting-started')
-rw-r--r-- | doc/src/getting-started/examples.qdoc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index a32d120..b2895ba 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -837,19 +837,19 @@ */ /*! - \page examples-multitouch.html + \page examples-touch.html \ingroup all-examples - \title Multi-Touch Examples - \brief Using Qt's multi-touch input capability + \title Touch Input Examples + \brief Using Qt's touch input capability - Support for multi-touch input makes it possible for developers to create + Support for touch input makes it possible for developers to create extensible and intuitive user interfaces. \list - \o \l{multitouch/dials}{Multi-Touch Dials} - \o \l{multitouch/fingerpaint}{Finger Paint} - \o \l{multitouch/knobs}{Multi-Touch Knobs} - \o \l{multitouch/pinchzoom}{Pinch Zoom} + \o \l{touch/dials}{Touch Dials} + \o \l{touch/fingerpaint}{Finger Paint} + \o \l{touch/knobs}{Touch Knobs} + \o \l{touch/pinchzoom}{Pinch Zoom} \endlist */ |