diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-15 12:24:51 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-15 12:24:51 (GMT) |
| commit | 4f46562b01cc068cd940281f71061386d7f4ecc3 (patch) | |
| tree | 523fa14f5f8b5c3a66464494425661be6f2c5d99 /src/corelib | |
| parent | 1637d135906296b2a32f17ed20c86869dc1667e8 (diff) | |
| parent | e7b372e4705451dfd4443db7e6fc64d4b8f30c68 (diff) | |
| download | Qt-4f46562b01cc068cd940281f71061386d7f4ecc3.zip Qt-4f46562b01cc068cd940281f71061386d7f4ecc3.tar.gz Qt-4f46562b01cc068cd940281f71061386d7f4ecc3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 73f28d6..6b1aa17 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 |