diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-22 11:13:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-22 11:13:50 (GMT) |
| commit | e0bd60f6c8a489c5703b648fe2e2470763f67e37 (patch) | |
| tree | 6f7e7be222134fc9e0dfdff0041e985b21020910 /doc | |
| parent | 9696376911ffc78b15b6a63929b0d83adfafe62e (diff) | |
| parent | 4214d58abd394eea2793f05a554bd9885b53d418 (diff) | |
| download | Qt-e0bd60f6c8a489c5703b648fe2e2470763f67e37.zip Qt-e0bd60f6c8a489c5703b648fe2e2470763f67e37.tar.gz Qt-e0bd60f6c8a489c5703b648fe2e2470763f67e37.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Compile when USER_TIMER_MINIMUM isn't defined
Docs: QTBUG-10866 Description of how AutoConnection is resolved.
Fix compilation with Sun Studio 12.1.
Compile with QT_NO_PROXYSCREEN.
silence compiler warnings
Don't let posted events starve native dialogs (regression)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/frameworks-technologies/threads.qdoc | 9 |
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 |