summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPeter Yard <peter.yard@nokia.com>2010-11-22 05:31:50 (GMT)
committerPeter Yard <peter.yard@nokia.com>2010-11-22 05:31:50 (GMT)
commitf479c4110cdcd82863abb172777b1bf9113ffb49 (patch)
tree22026f9497d58df5c2a98fa5a15e5163b2fa9d5f /doc
parent2ac57db7a7e53f72272540e7857c14b29d2a2fce (diff)
downloadQt-f479c4110cdcd82863abb172777b1bf9113ffb49.zip
Qt-f479c4110cdcd82863abb172777b1bf9113ffb49.tar.gz
Qt-f479c4110cdcd82863abb172777b1bf9113ffb49.tar.bz2
Docs: QTBUG-10866 Description of how an AutoConnection is resolved.
Diffstat (limited to 'doc')
-rw-r--r--doc/src/frameworks-technologies/threads.qdoc9
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/src/frameworks-technologies/threads.qdoc b/doc/src/frameworks-technologies/threads.qdoc
index 3ef617c..001b29d 100644
--- a/doc/src/frameworks-technologies/threads.qdoc
+++ b/doc/src/frameworks-technologies/threads.qdoc
@@ -459,11 +459,10 @@
\list
- \o \l{Qt::AutoConnection}{Auto Connection} (default) The behavior
- is the same as the Direct Connection, if the emitter and
- receiver are in the same thread. The behavior is the same as
- the Queued Connection, if the emitter and receiver are in
- different threads.
+ \o \l{Qt::AutoConnection}{Auto Connection} (default) If the signal is
+ emitted in the thread which the receiving object has affinity then
+ the behavior is the same as the Direct Connection. Otherwise,
+ the behavior is the same as the Queued Connection."
\o \l{Qt::DirectConnection}{Direct Connection} The slot is invoked
immediately, when the signal is emitted. The slot is executed