diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-04 18:50:23 +0200 |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-04 18:50:23 +0200 |
| commit | e8b116e793d13204fb00b286becf95d2a933a784 (patch) | |
| tree | 7d94b673694d5c9e7475faeae35f1268e518cca8 /src/gui/kernel/qgesture.cpp | |
| parent | 42f1e22bdfe2fe29f305dbf50e23933b8e1ef8d0 (diff) | |
| parent | a214bb99775e898fd9233b932f08ff91a57fc053 (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
doc/src/examples/qml-examples.qdoc
Diffstat (limited to 'src/gui/kernel/qgesture.cpp')
| -rw-r--r-- | src/gui/kernel/qgesture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qgesture.cpp b/src/gui/kernel/qgesture.cpp index de80f86bad..13274c4630 100644 --- a/src/gui/kernel/qgesture.cpp +++ b/src/gui/kernel/qgesture.cpp @@ -312,10 +312,10 @@ void QPanGesture::setAcceleration(qreal value) \class QPinchGesture \since 4.6 \brief The QPinchGesture class describes a pinch gesture made my the user. - \ingroup multitouch + \ingroup touch \ingroup gestures - A pinch gesture is a form of multitouch user input in which the user typically + A pinch gesture is a form of touch user input in which the user typically touches two points on the input device with a thumb and finger, before moving them closer together or further apart to change the scale factor, zoom, or level of detail of the user interface. @@ -398,7 +398,7 @@ void QPanGesture::setAcceleration(qreal value) \brief the current scale factor The scale factor measures the scale factor associated with the distance - between two of the user's inputs on a multitouch device. + between two of the user's inputs on a touch device. \sa totalScaleFactor, lastScaleFactor */ |