diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-07-17 00:26:25 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-07-17 00:26:25 (GMT) |
| commit | 4200dec4f01d8181a39704c149bc49c9a8882274 (patch) | |
| tree | 6a17d899567c5569ad47673bd734c9221f1e9fc9 /src/corelib/concurrent/qtconcurrentmap.cpp | |
| parent | 46fa97f020a310de3ad6f92860dffdb402955b14 (diff) | |
| parent | b1690ae329a3b81628d3ac6c19b24960177b6e73 (diff) | |
| download | Qt-4200dec4f01d8181a39704c149bc49c9a8882274.zip Qt-4200dec4f01d8181a39704c149bc49c9a8882274.tar.gz Qt-4200dec4f01d8181a39704c149bc49c9a8882274.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/corelib/concurrent/qtconcurrentmap.cpp')
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentmap.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/concurrent/qtconcurrentmap.cpp b/src/corelib/concurrent/qtconcurrentmap.cpp index b8c753a..797f335 100644 --- a/src/corelib/concurrent/qtconcurrentmap.cpp +++ b/src/corelib/concurrent/qtconcurrentmap.cpp @@ -41,13 +41,14 @@ /*! \namespace QtConcurrent + \inmodule QtCore \since 4.4 \brief The QtConcurrent namespace provides high-level APIs that make it possible to write multi-threaded programs without using low-level threading primitives. See the \l {threads.html#qtconcurrent-intro}{Qt Concurrent} section in the \l{threads.html}{threading} documentation. - + \inheaderfile QtCore \ingroup thread */ |