summaryrefslogtreecommitdiffstats
path: root/doc/src/qnamespace.qdoc
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-04-07 06:16:59 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-04-07 06:16:59 (GMT)
commitcbec6d9481bf8f55834eafac4eca53f85206b240 (patch)
tree9875b3dd5a87c0274ee0d57f541f836598936f2b /doc/src/qnamespace.qdoc
parentbe8b6047ccd43df1127beb4c602c58408ff9b612 (diff)
parent939623b2bc8e441618ee1a1886cc656880bee62b (diff)
downloadQt-cbec6d9481bf8f55834eafac4eca53f85206b240.zip
Qt-cbec6d9481bf8f55834eafac4eca53f85206b240.tar.gz
Qt-cbec6d9481bf8f55834eafac4eca53f85206b240.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'doc/src/qnamespace.qdoc')
-rw-r--r--doc/src/qnamespace.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc
index 07972af..a99e434 100644
--- a/doc/src/qnamespace.qdoc
+++ b/doc/src/qnamespace.qdoc
@@ -508,11 +508,11 @@
\value DirectConnection When emitted, the signal is immediately delivered to the slot.
\value QueuedConnection When emitted, the signal is queued until the event loop is
able to deliver it to the slot.
- \value
- BlockingQueuedConnection Same as QueuedConnection, except that the current thread blocks
+ \value BlockingQueuedConnection
+ Same as QueuedConnection, except that the current thread blocks
until the slot has been delivered. This connection type should
only be used for receivers in a different thread. Note that misuse
- of this type can lead to dead locks in your application.
+ of this type can lead to deadlocks in your application.
\value AutoConnection If the signal is emitted from the thread
in which the receiving object lives, the
slot is invoked directly, as with