diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-10-01 16:21:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-10-01 16:21:12 +0200 |
| commit | 8ee9774e67edf57d891528749a360a0af8f0c6f7 (patch) | |
| tree | e0b7d4b19c26c48fe41e930532f2037f8dc43204 /src/corelib/thread/qfuture.qdoc | |
| parent | d78fb442d750b33afe2e41f31588ec94cf4023ad (diff) | |
| parent | 8ab25620d3df25c43011ae982f4614639578afb3 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/corelib/thread/qfuture.qdoc')
| -rw-r--r-- | src/corelib/thread/qfuture.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc index 6966047c13..92f21fc512 100644 --- a/src/corelib/thread/qfuture.qdoc +++ b/src/corelib/thread/qfuture.qdoc @@ -89,7 +89,7 @@ /*! \fn QFuture::QFuture() - Constructs an empty future. + Constructs an empty, canceled future. */ /*! \fn QFuture::QFuture(const QFuture &other) |