summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPasi Petäjäjärvi <pasi.petajajarvi@digia.com>2012-02-27 11:10:56 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-03-07 08:38:05 (GMT)
commitc1a0e58df7f49ef116a843ca58defe6564808098 (patch)
treee34e19dfe09052620b577b426e2c08f621f0f8bf /doc
parent74b8a6134a296bbe47ad5e695ee7463c5f1e1130 (diff)
downloadQt-c1a0e58df7f49ef116a843ca58defe6564808098.zip
Qt-c1a0e58df7f49ef116a843ca58defe6564808098.tar.gz
Qt-c1a0e58df7f49ef116a843ca58defe6564808098.tar.bz2
Fix for QTBUG-21466: References to deprecated mouse drivers
References to deprecated and removed mouse and keyboard drivers in documentation. Removed references. Task-number: QTBUG-21466 Change-Id: I0ea9db679023a5e9a60663d64a9797df4310e662 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/platforms/emb-envvars.qdoc20
-rw-r--r--doc/src/snippets/code/doc_src_emb-envvars.qdoc9
2 files changed, 8 insertions, 21 deletions
diff --git a/doc/src/platforms/emb-envvars.qdoc b/doc/src/platforms/emb-envvars.qdoc
index 20c7be9..4b00258 100644
--- a/doc/src/platforms/emb-envvars.qdoc
+++ b/doc/src/platforms/emb-envvars.qdoc
@@ -106,8 +106,8 @@
\snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 2
The valid values for the \c <driver> argument are \c MouseMan, \c
- IntelliMouse, \c Microsoft, \c VR41xx, \c LinuxTP, \c Yopy. \c
- Tslib and \l {QMouseDriverPlugin::keys()}{keys} identifying
+ IntelliMouse, \c Microsoft, \c LinuxTP, \c LinuxInput, \c Tslib
+ and \l {QMouseDriverPlugin::keys()}{keys} identifying
custom drivers, and the driver specific options are typically a
device, e.g., \c /dev/mouse for mouse devices and \c /dev/ts for
touch panels.
@@ -117,13 +117,6 @@
\snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 3
Input will be read from all specified drivers.
- Note that the \c Vr41xx driver also accepts two optional
- arguments: \c press=<value> defining a mouseclick (the default
- value is 750) and \c filter=<value> specifying the length of the
- filter used to eliminate noise (the default length is 3). For
- example:
-
- \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 4
See also \l {Qt for Embedded Linux Pointer Handling}.
@@ -134,17 +127,16 @@
Specifies the driver and device for character input. For example, if the
current shell is bash, ksh, zsh or sh:
- \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 5
+ \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 4
- The valid values for the \c <driver> argument are \c SL5000, \c
- Yopy, \c VR41xx, \c TTY, \c USB and \l
- {QKbdDriverPlugin::keys()}{keys} identifying custom drivers,
+ The valid values for the \c <driver> argument are \c TTY,
+ \c LinuxInput and \l {QKbdDriverPlugin::keys()}{keys} identifying custom drivers,
and the driver specific options are typically a device, e.g., \c
/dev/tty0.
Multiple keyboard drivers can be specified in one go:
- \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 6
+ \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 5
Input will be read from all specified drivers.
diff --git a/doc/src/snippets/code/doc_src_emb-envvars.qdoc b/doc/src/snippets/code/doc_src_emb-envvars.qdoc
index 6d79d44..08c58ac 100644
--- a/doc/src/snippets/code/doc_src_emb-envvars.qdoc
+++ b/doc/src/snippets/code/doc_src_emb-envvars.qdoc
@@ -62,17 +62,12 @@ export QWS_MOUSE_PROTO="<driver>[:<driver specific options>]
//! [4]
-export QWS_MOUSE_PROTO="Vr41xx:press=500:/dev/misc/ts"
+export QWS_KEYBOARD=<driver>[:<driver specific options>]
//! [4]
//! [5]
-export QWS_KEYBOARD=<driver>[:<driver specific options>]
-//! [5]
-
-
-//! [6]
export QWS_KEYBOARD="<driver>[:<driver specific options>]
<driver>[:<driver specific options>]
<driver>[:<driver specific options>]"
-//! [6]
+//! [5]