diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 19:07:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 19:07:34 (GMT) |
| commit | 4ef9e81c777affd140dbda97645b31b7658c7280 (patch) | |
| tree | bbf07db11604e1c2541cf8abbea6465b729864f0 /src/corelib/concurrent | |
| parent | 677f1b4af363845189d93bf564ab9ba97eb160e0 (diff) | |
| parent | 45b205692e457bf39a245436b7db0bb03bd27bbd (diff) | |
| download | Qt-4ef9e81c777affd140dbda97645b31b7658c7280.zip Qt-4ef9e81c777affd140dbda97645b31b7658c7280.tar.gz Qt-4ef9e81c777affd140dbda97645b31b7658c7280.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:
Fixed translucent window rendering on 16 bit X11.
GV: Update issues if drawItems() is overridden and IndirectPainting is used.
More pedantry.
Fix grammar.
Doc: QFutureWatcher: specify that calls to setFuture should happen after the connections
Diffstat (limited to 'src/corelib/concurrent')
| -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 |