summaryrefslogtreecommitdiffstats
path: root/doc/src/examples/blockingfortuneclient.qdoc
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-03-05 10:44:04 +0100
committerLars Knoll <lars.knoll@nokia.com>2012-03-05 10:44:48 +0100
commitd51abed57a8f677a0d4eac57fd3f16bd4662190a (patch)
treeb3e173db4b72edbff6cb8dcc203c3d4526a1b51b /doc/src/examples/blockingfortuneclient.qdoc
parent07ae18f96e87a2db40ae014f28893f1080efa7ae (diff)
parent0862d7f78af978cf513097b3bdc33cd8096dee75 (diff)
Merge remote-tracking branch 'origin/master' into api_changes
Diffstat (limited to 'doc/src/examples/blockingfortuneclient.qdoc')
-rw-r--r--doc/src/examples/blockingfortuneclient.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/examples/blockingfortuneclient.qdoc b/doc/src/examples/blockingfortuneclient.qdoc
index 34add534d4..6c3be78859 100644
--- a/doc/src/examples/blockingfortuneclient.qdoc
+++ b/doc/src/examples/blockingfortuneclient.qdoc
@@ -38,14 +38,14 @@
\list
- \o \e{The asynchronous (non-blocking) approach.} Operations are scheduled
+ \li \e{The asynchronous (non-blocking) approach.} Operations are scheduled
and performed when control returns to Qt's event loop. When the operation
is finished, QTcpSocket emits a signal. For example,
QTcpSocket::connectToHost() returns immediately, and when the connection
has been established, QTcpSocket emits
\l{QTcpSocket::connected()}{connected()}.
- \o \e{The synchronous (blocking) approach.} In non-GUI and multithreaded
+ \li \e{The synchronous (blocking) approach.} In non-GUI and multithreaded
applications, you can call the \c waitFor...() functions (e.g.,
QTcpSocket::waitForConnected()) to suspend the calling thread until the
operation has completed, instead of connecting to signals.