diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:11:48 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:11:48 +0100 |
commit | b240d198f80e47c484f1c22d259da85227421950 (patch) | |
tree | e506824a0b7d0d6201b51a686559043c243512b0 /examples/serialport/doc/blockingslave.qdoc | |
parent | 296b5964c05e312a7c83ba44379ba258755e13a3 (diff) | |
parent | 65dd36db940bd9b0c1806f66c54bb672b08eb9b8 (diff) | |
download | qtserialport-b240d198f80e47c484f1c22d259da85227421950.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I10b71332b0ec3afc50d11bcc95adb94c6343f6b1
Diffstat (limited to 'examples/serialport/doc/blockingslave.qdoc')
-rw-r--r-- | examples/serialport/doc/blockingslave.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/serialport/doc/blockingslave.qdoc b/examples/serialport/doc/blockingslave.qdoc index c98080d..df35bfc 100644 --- a/examples/serialport/doc/blockingslave.qdoc +++ b/examples/serialport/doc/blockingslave.qdoc @@ -62,7 +62,7 @@ leads to simpler code, but because of its blocking behavior, it should only be used in non-GUI threads to prevent the user interface from freezing. But contrary to what many think, using threads with QThread does not - necessarily add unmanagable complexity to your application. + necessarily add unmanageable complexity to your application. This application is a Slave, that demonstrate the work paired with Master application \l{Blocking Master Example}. |