diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-15 04:54:25 (GMT) |
|---|---|---|
| committer | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-15 04:54:25 (GMT) |
| commit | 4d4ed81c6df7954d89dad554267cba8d3cfd6bde (patch) | |
| tree | f125ef0e8cccd286950c6cdda011ce8a5e7b1fca /src/corelib/concurrent | |
| parent | 751a45bc22aa1f27a5dab3ce18e83c0f699ee05f (diff) | |
| parent | cffc92bac940fd7fcae0a9ff82a54a124d70ebed (diff) | |
| download | Qt-4d4ed81c6df7954d89dad554267cba8d3cfd6bde.zip Qt-4d4ed81c6df7954d89dad554267cba8d3cfd6bde.tar.gz Qt-4d4ed81c6df7954d89dad554267cba8d3cfd6bde.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/corelib/concurrent')
| -rw-r--r-- | src/corelib/concurrent/qfuturewatcher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/concurrent/qfuturewatcher.cpp b/src/corelib/concurrent/qfuturewatcher.cpp index 3b808b8..d4573c6 100644 --- a/src/corelib/concurrent/qfuturewatcher.cpp +++ b/src/corelib/concurrent/qfuturewatcher.cpp @@ -505,7 +505,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event) finished signal will be emitted. To avoid a race condition, it is important to call this function - \i after doing the connections. + \e after doing the connections. */ /*! \fn QFuture<T> QFutureWatcher::future() const |