diff options
| author | Laszlo Papp <lpapp@kde.org> | 2013-04-30 18:31:53 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-30 21:10:36 +0200 |
| commit | ce248225110bef2433bfcdbe8f462bf878dd63f7 (patch) | |
| tree | bb02df9e784449b389bbe65d8bc536b052c4b579 | |
| parent | 0add3b934b8405fc5b65efeba9f05cc1dc353e64 (diff) | |
| download | qtserialport-ce248225110bef2433bfcdbe8f462bf878dd63f7.tar.gz | |
Eliminate the blocking terminal example notes as it still does not exist
Change-Id: I28986ada705996ada22b30d10877ea9eed0dba8f
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| -rw-r--r-- | examples/doc/terminal.qdoc | 4 | ||||
| -rw-r--r-- | src/serialport/qserialport.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/examples/doc/terminal.qdoc b/examples/doc/terminal.qdoc index d5ce209..4a6b0d6 100644 --- a/examples/doc/terminal.qdoc +++ b/examples/doc/terminal.qdoc @@ -57,9 +57,7 @@ \endlist - In this example, the asynchronous approach is demonstrated. The - \l{examples/blockingterminal}{Blocking Simple Terminal} example - illustrates the synchronous approach. + In this example, the asynchronous approach is demonstrated. Our example contains some GUI widgets: diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index b48ba35..b86b382 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -214,7 +214,7 @@ int QSerialPortPrivateData::timeoutValue(int msecs, int elapsed) However, in a GUI application, blocking serial port should only be used in non-GUI threads, to avoid freezing the user interface. - See the \l examples/terminal and \l examples/blockingterminal + See the \l master, \l slave, \l blockingmaster, and \l blockingslave examples for an overview of both approaches. The use of blocking functions is discouraged together with signals. One of |