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/examples/fingerpaint.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/examples/fingerpaint.qdoc')
| -rw-r--r-- | doc/src/examples/fingerpaint.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/examples/fingerpaint.qdoc b/doc/src/examples/fingerpaint.qdoc index f438082..4b62570 100644 --- a/doc/src/examples/fingerpaint.qdoc +++ b/doc/src/examples/fingerpaint.qdoc @@ -26,11 +26,11 @@ ****************************************************************************/ /*! - \example multitouch/fingerpaint + \example touch/fingerpaint \title Finger Paint Example - The Finger Paint example shows the use of multi-touch with a custom widget + The Finger Paint example shows the use of touch with a custom widget to create a simple painting application. - \image multitouch-fingerpaint-example.png + \image touch-fingerpaint-example.png */ |