summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2010-10-06 12:13:02 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2010-10-06 12:13:02 (GMT)
commitf6d9c3f0dd014c409c43150b3a10866f47ea54a6 (patch)
treeff51b5f24f84b7f4d25642019d8347db695ade8f
parentd20d4837b4ed27f786b5b181ebd003e5274cffae (diff)
downloadQt-f6d9c3f0dd014c409c43150b3a10866f47ea54a6.zip
Qt-f6d9c3f0dd014c409c43150b3a10866f47ea54a6.tar.gz
Qt-f6d9c3f0dd014c409c43150b3a10866f47ea54a6.tar.bz2
Clarified the auto connect enumeration regarding which type of
connection is made. Task-number: QTBUG-14223 Reviewed-by: David Boddie
-rw-r--r--src/corelib/global/qnamespace.qdoc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index ad0ffd7..32e85db 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -511,9 +511,11 @@
delivery at a later time.
\value AutoConnection
- (default) Same as DirectConnection, if the emitter and
- receiver are in the same thread. Same as QueuedConnection,
- if the emitter and receiver are in different threads.
+ (default) If the object sending the signal is in a different thread
+ than the receiving object, the signal is queued, behaving as
+ Qt::QueuedConnection. If both objects are in the same thread,
+ the slot is invoked directly, behaving as Qt::DirectConnection. The
+ type of connection is determined when the signal is emitted.
\value DirectConnection
The slot is invoked immediately, when the signal is