diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 11:57:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 11:57:10 (GMT) |
| commit | 9be49ff72e7f34bd22b0375dccf142bd79f94fb6 (patch) | |
| tree | 81996c769fdf513ef6dfed6ad3f731da11c42ddf /src | |
| parent | 298280f8e553ebb4a949e8ea3d380dd23ef097e3 (diff) | |
| parent | fb7fc9ee85c47446b0fb4d11789949784fbf853c (diff) | |
| download | Qt-9be49ff72e7f34bd22b0375dccf142bd79f94fb6.zip Qt-9be49ff72e7f34bd22b0375dccf142bd79f94fb6.tar.gz Qt-9be49ff72e7f34bd22b0375dccf142bd79f94fb6.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
More pedantry.
Fix grammar.
Doc: QFutureWatcher: specify that calls to setFuture should happen after the connections
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/concurrent/qfuturewatcher.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/concurrent/qfuturewatcher.cpp b/src/corelib/concurrent/qfuturewatcher.cpp index 3065205..3b808b8 100644 --- a/src/corelib/concurrent/qfuturewatcher.cpp +++ b/src/corelib/concurrent/qfuturewatcher.cpp @@ -499,6 +499,13 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event) /*! \fn void QFutureWatcher::setFuture(const QFuture<T> &future) Starts watching the given \a future. + + One of the signals might be emitted for the current state of the + \a future. For example, if the future is already stopped, the + finished signal will be emitted. + + To avoid a race condition, it is important to call this function + \i after doing the connections. */ /*! \fn QFuture<T> QFutureWatcher::future() const |