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/concurrent/qtconcurrentfilter.cpp | |
| parent | 5957f245c6c77c98d7e90d614c9fe2cdbfe7e8e6 (diff) | |
| parent | a23ff58d716f62b02ec825a3ea3c6b07616ee3f0 (diff) | |
Merge branch 'stable' into dev
Change-Id: I37d85631ab1165ab91457d8880c4da907a9df73b
Diffstat (limited to 'src/concurrent/qtconcurrentfilter.cpp')
| -rw-r--r-- | src/concurrent/qtconcurrentfilter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/concurrent/qtconcurrentfilter.cpp b/src/concurrent/qtconcurrentfilter.cpp index ef0229a695..7889fbff56 100644 --- a/src/concurrent/qtconcurrentfilter.cpp +++ b/src/concurrent/qtconcurrentfilter.cpp @@ -47,7 +47,7 @@ \brief The <QtConcurrentFilter> header provides concurrent Filter and Filter-Reduce. - These functions are a part of the \l {Concurrent Programming}{Qt Concurrent} framework. + These functions are a part of the \l {Qt Concurrent} framework. The QtConcurrent::filter(), QtConcurrent::filtered() and QtConcurrent::filteredReduced() functions filter items in a sequence such |