diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-26 02:57:58 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-26 02:57:58 (GMT) |
| commit | e07f3aebda9892dcb7c21b7b867dac27e51fd039 (patch) | |
| tree | f2d77c02953cccdabdb93bf3644f86753b361a50 /doc/src/platforms/emb-pointer.qdoc | |
| parent | 869285037c28afef45b368d30917617dabe61559 (diff) | |
| parent | 4602d75963a415d3ebe20a807aed7284b714790e (diff) | |
| download | Qt-e07f3aebda9892dcb7c21b7b867dac27e51fd039.zip Qt-e07f3aebda9892dcb7c21b7b867dac27e51fd039.tar.gz Qt-e07f3aebda9892dcb7c21b7b867dac27e51fd039.tar.bz2 | |
Merge remote branch 'qt/master'
Conflicts:
tools/qdoc3/test/qdeclarative.qdocconf
tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
Diffstat (limited to 'doc/src/platforms/emb-pointer.qdoc')
| -rw-r--r-- | doc/src/platforms/emb-pointer.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/platforms/emb-pointer.qdoc b/doc/src/platforms/emb-pointer.qdoc index 81e532f..506e9e0 100644 --- a/doc/src/platforms/emb-pointer.qdoc +++ b/doc/src/platforms/emb-pointer.qdoc @@ -105,7 +105,7 @@ {touch panels} in which case the driver must be specified explicitly to determine which device to use. - To manually specify which driver to use, set the QWS_MOUSE_PROTO + To manually specify which driver to use, set the \c QWS_MOUSE_PROTO environment variable. For example (if the current shell is bash, ksh, zsh or sh): @@ -156,7 +156,7 @@ \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 8 To make \l{Qt for Embedded Linux} explicitly choose the tslib mouse - handler, set the QWS_MOUSE_PROTO environment variable as explained + handler, set the \c QWS_MOUSE_PROTO environment variable as explained above. \endtable |