summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorHarri Heine <harri.heine@nokia.com>2012-03-08 14:12:51 +0200
committerQt by Nokia <qt-info@nokia.com>2012-03-08 13:24:37 +0100
commit172635fa17fd2fa141f099ba031058477a326dde (patch)
tree399e89569b389662ded9f8757c4386dac6d6d45d /doc
parent5ed1b16ba9ccc937cd9416207d58deb87fe110e0 (diff)
Documentation: Wording improvements.
Change-Id: Ie36b73bab365018a40144330be70943c498fefa9 Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/index.qdoc10
-rw-r--r--doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.cpp4
2 files changed, 5 insertions, 9 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index e3a631b..c34a969 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -28,13 +28,14 @@
/*!
\page index.html
-\title Feedback
+\title C++ Feedback API
\brief An API enabling a client to provide tactile and audio feedback to user actions.
\ingroup mobility
-The Feedback API enables a client to control and provide tactile and audio feedback
+
+The C++ Feedback API enables a client to control and provide tactile and audio feedback
to the user. The feedback is in response to user actions. For example, touching an
onscreen button. Control of the feedback involves control of the vibration of
the device, when a vibrator is used, or the piezo feedback from the screen.
@@ -193,11 +194,6 @@ application.
\li \l{hapticsplayer}{Haptics Player}
\endlist
-\section1 QML Elements
-
-For details on the QML support provided for the Feedback API see the documentation for the \l {Feedback QML Plugin}.
-
-
*/
diff --git a/doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.cpp b/doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.cpp
index 722349e..d252624 100644
--- a/doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.cpp
+++ b/doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.cpp
@@ -50,11 +50,11 @@ void completeExample();
void completeExample()
{
//! [Play the system theme button click effect]
- QFeedbackEffect::playThemeEffect(QFeedbackEffect::ThemeBasicButton);
+ QFeedbackEffect::playThemeEffect(QFeedbackEffect::Press);
//! [Play the system theme button click effect]
//! [Play the system theme bounce effect]
- QFeedbackEffect::playThemeEffect(QFeedbackEffect::ThemeBounceEffect);
+ QFeedbackEffect::playThemeEffect(QFeedbackEffect::DragStart);
//! [Play the system theme bounce effect]
//! [Define a custom haptic effect]