summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2010-10-15 08:42:21 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2010-10-15 08:42:21 (GMT)
commit0a299be472da5829e17b886450dd134302b861a0 (patch)
treec13eaa6d0d02cf49039204f42757b0c237c06301 /src/corelib
parent2e9a8a97d0f262d35bdb78210b5d2b6bee46efba (diff)
downloadQt-0a299be472da5829e17b886450dd134302b861a0.zip
Qt-0a299be472da5829e17b886450dd134302b861a0.tar.gz
Qt-0a299be472da5829e17b886450dd134302b861a0.tar.bz2
Changed language of the AutoConnection description.
Task-number: QTBUG-14223 Reviewed-by: Olivier Goffart
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qnamespace.qdoc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 1c41eca..dd02e17 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -511,11 +511,11 @@
delivery at a later time.
\value AutoConnection
- (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.
+ (default) If the signal is emitted from a different thread than the
+ receiving object, the signal is queued, behaving as
+ Qt::QueuedConnection. Otherwise, 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