summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Yard <peter.yard@nokia.com>2010-11-22 04:48:17 (GMT)
committerPeter Yard <peter.yard@nokia.com>2010-11-22 04:48:17 (GMT)
commite6a09f87f3224588324218b6f9498bee81d178fc (patch)
tree9462caa4ddb0154cca1f558521a50c9d8b075c2a
parent346953b985deb5003e801b23063daf3f6dee3824 (diff)
downloadQt-e6a09f87f3224588324218b6f9498bee81d178fc.zip
Qt-e6a09f87f3224588324218b6f9498bee81d178fc.tar.gz
Qt-e6a09f87f3224588324218b6f9498bee81d178fc.tar.bz2
Docs: QTBUG-10866 Description of how AutoConnection is resolved.
-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