diff options
Diffstat (limited to 'src/corelib/thread/qfuture.qdoc')
| -rw-r--r-- | src/corelib/thread/qfuture.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc index 076725e19c..e6bc937d85 100644 --- a/src/corelib/thread/qfuture.qdoc +++ b/src/corelib/thread/qfuture.qdoc @@ -51,7 +51,7 @@ (QFuture::const_iterator). Using these iterators is another way to access results in the future. - QFuture also offers ways to interact with a runnning computation. For + QFuture also offers ways to interact with a running computation. For instance, the computation can be canceled with the cancel() function. To pause the computation, use the setPaused() function or one of the pause(), resume(), or togglePaused() convenience functions. Be aware that not all @@ -125,8 +125,8 @@ /*! \fn template <typename T> void QFuture<T>::cancel() Cancels the asynchronous computation represented by this future. Note that - the cancelation is asynchronous. Use waitForFinished() after calling - cancel() when you need synchronous cancelation. + the cancellation is asynchronous. Use waitForFinished() after calling + cancel() when you need synchronous cancellation. Results currently available may still be accessed on a canceled future, but new results will \e not become available after calling this function. |