summaryrefslogtreecommitdiffstats
path: root/doc/src/development/assistant-manual.qdoc
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-11-13 10:59:01 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-11-13 10:59:01 (GMT)
commitf1aeeb025c5042f6684855006f963e2203d9c153 (patch)
tree430cbdfa0c42e23289f7cd4b5907656810dbe895 /doc/src/development/assistant-manual.qdoc
parent168524d4f642724fe9063500c0c39ab747f145b6 (diff)
parent88412920c58286d22aaa1e121b1030298adf86eb (diff)
downloadQt-f1aeeb025c5042f6684855006f963e2203d9c153.zip
Qt-f1aeeb025c5042f6684855006f963e2203d9c153.tar.gz
Qt-f1aeeb025c5042f6684855006f963e2203d9c153.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf
Diffstat (limited to 'doc/src/development/assistant-manual.qdoc')
-rw-r--r--doc/src/development/assistant-manual.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/development/assistant-manual.qdoc b/doc/src/development/assistant-manual.qdoc
index 8de500e..3ecadc7 100644
--- a/doc/src/development/assistant-manual.qdoc
+++ b/doc/src/development/assistant-manual.qdoc
@@ -672,9 +672,6 @@
to make Assistant listen to your application, turn on its remote control
functionality by passing the \c{-enableRemoteControl} command line option.
- \warning The trailing '\0' must be appended separately to the QByteArray,
- e.g., \c{QByteArray("command" + '\0')}.
-
The following example shows how this can be done:
\snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 2
@@ -685,6 +682,9 @@
\snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 3
+ Note that the trailing newline character is required to mark the end
+ of the input.
+
The following commands can be used to control \QA:
\table