diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-21 17:32:39 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-21 17:33:15 +0200 |
| commit | a5d34b34fbd867bd13ce94cdaf55d96576d4d14d (patch) | |
| tree | bb3b8b902f13bda65e49485a789f0eca07329ab5 /src/corelib/thread/qfuturewatcher.cpp | |
| parent | 5957f245c6c77c98d7e90d614c9fe2cdbfe7e8e6 (diff) | |
| parent | a23ff58d716f62b02ec825a3ea3c6b07616ee3f0 (diff) | |
Merge branch 'stable' into dev
Change-Id: I37d85631ab1165ab91457d8880c4da907a9df73b
Diffstat (limited to 'src/corelib/thread/qfuturewatcher.cpp')
| -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 53a00a8212b..a7f2dd9f73d 100644 --- a/src/corelib/thread/qfuturewatcher.cpp +++ b/src/corelib/thread/qfuturewatcher.cpp @@ -98,7 +98,7 @@ QT_BEGIN_NAMESPACE QFutureWatcher<void> as well. This is useful if only status or progress information is needed; not the actual result data. - \sa QFuture, {Concurrent Programming}{Qt Concurrent} + \sa QFuture, {Qt Concurrent} */ /*! \fn QFutureWatcher::QFutureWatcher(QObject *parent) |