diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-21 17:34:59 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-21 18:39:13 +0200 |
commit | 4cebef621bb108c76f3cc8bfd0fdf77174b6499d (patch) | |
tree | 657eceb4539343312e7cd33b3644d1b1ec116ae2 /src/corelib/thread/qfuture.qdoc | |
parent | 8969f57b6abef31d2e27500742dffa5498e38a46 (diff) | |
parent | a5d34b34fbd867bd13ce94cdaf55d96576d4d14d (diff) |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/thread/qfuture.qdoc')
-rw-r--r-- | src/corelib/thread/qfuture.qdoc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc index 421e683c4a..7ae3e4a87e 100644 --- a/src/corelib/thread/qfuture.qdoc +++ b/src/corelib/thread/qfuture.qdoc @@ -47,8 +47,7 @@ \ingroup thread - To start a computation, use one of the APIs in the - \l {Concurrent Programming}{Qt Concurrent} framework. + To start a computation, use one of the APIs in the \l {Qt Concurrent} framework. QFuture allows threads to be synchronized against one or more results which will be ready at a later point in time. The result can be of any type @@ -93,7 +92,7 @@ To interact with running tasks using signals and slots, use QFutureWatcher. - \sa QFutureWatcher, {Concurrent Programming}{Qt Concurrent} + \sa QFutureWatcher, {Qt Concurrent} */ /*! \fn QFuture::QFuture() |