diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-30 01:00:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-30 01:00:14 +0200 |
| commit | 17f4d159a90d477dc0c7851e73a0a1cb6a86833e (patch) | |
| tree | 3396f91fc873a5996548cf99cba16fff0e8c7fdd /src/corelib/thread | |
| parent | bff59f87ba11cac1dfa710f021522372de7a776f (diff) | |
| parent | ee6164942d21e7db5b5a6520cb0dbe1b9d631b21 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: If9cc79a7cc098104333821bc3b345f6890f01825
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qfuturewatcher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qfuturewatcher.cpp b/src/corelib/thread/qfuturewatcher.cpp index 8c4cb9a5a2..5b68af1fbc 100644 --- a/src/corelib/thread/qfuturewatcher.cpp +++ b/src/corelib/thread/qfuturewatcher.cpp @@ -576,7 +576,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event) This signal is emitted when the watched future reports a ready result at \a index. If the future reports multiple results, the index will indicate which one it is. Results can be reported out-of-order. To get the result, - call future().result(index); + call resultAt(index); */ /*! |