diff options
Diffstat (limited to 'src/concurrent/doc/src/qtconcurrent-index.qdoc')
| -rw-r--r-- | src/concurrent/doc/src/qtconcurrent-index.qdoc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/concurrent/doc/src/qtconcurrent-index.qdoc b/src/concurrent/doc/src/qtconcurrent-index.qdoc index d259516119..2157280021 100644 --- a/src/concurrent/doc/src/qtconcurrent-index.qdoc +++ b/src/concurrent/doc/src/qtconcurrent-index.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software ** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure +** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements ** will be met: http://www.gnu.org/copyleft/fdl.html. ** $QT_END_LICENSE$ @@ -50,25 +50,25 @@ \list - \li QtConcurrent::map() applies a function to every item in a container, + \li \l {QtConcurrent::map}{QtConcurrent::map()} applies a function to every item in a container, modifying the items in-place. - \li QtConcurrent::mapped() is like map(), except that it returns a new + \li \l {QtConcurrent::mapped}{QtConcurrent::mapped()} is like map(), except that it returns a new container with the modifications. - \li QtConcurrent::mappedReduced() is like mapped(), except that the + \li \l {QtConcurrent::mappedReduced}{QtConcurrent::mappedReduced()} is like mapped(), except that the modified results are reduced or folded into a single result. - \li QtConcurrent::filter() removes all items from a container based on the + \li \l {QtConcurrent::filter}{QtConcurrent::filter()} removes all items from a container based on the result of a filter function. - \li QtConcurrent::filtered() is like filter(), except that it returns a new + \li \l {QtConcurrent::filtered}{QtConcurrent::filtered()} is like filter(), except that it returns a new container with the filtered results. - \li QtConcurrent::filteredReduced() is like filtered(), except that the + \li \l {QtConcurrent::filteredReduced}{QtConcurrent::filteredReduced()} is like filtered(), except that the filtered results are reduced or folded into a single result. - \li QtConcurrent::run() runs a function in another thread. + \li \l {QtConcurrent::run}{QtConcurrent::run()} runs a function in another thread. \li QFuture represents the result of an asynchronous computation. |