diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-08-03 10:53:57 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-08-03 10:53:57 (GMT) |
| commit | d5491ecdde14659a913c9f476f18c45f1d9489bb (patch) | |
| tree | 06cc52249feda9bd9e50ca47abb8ebd676c8a309 /doc/src/getting-started/examples.qdoc | |
| parent | 42cdfaf86d34afeb6448723839fef70fe477deed (diff) | |
| parent | a41128af5373a0225c3548abd3eb82cd7e8f7a0e (diff) | |
| download | Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.zip Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.tar.gz Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse
Conflicts:
configure
Diffstat (limited to 'doc/src/getting-started/examples.qdoc')
| -rw-r--r-- | doc/src/getting-started/examples.qdoc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index b6766d5..b2895ba 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -343,8 +343,8 @@ /*! \page examples-draganddrop.html \ingroup all-examples - \title Drag & Drop Examples - \brief How to access your platform's native darg & drop functionality + \title Drag & Drop Examples + \brief How to access your platform's native darg & drop functionality \image draganddrop-examples.png @@ -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 */ |