From 4f9575ecbcfd40252b9ad28092e815efe9e824da Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@qt.io>
Date: Fri, 13 Jan 2017 12:12:06 +0100
Subject: doc: Fix all qdoc errors in QtConcurrent

These errors resulted from the improved parsing provided
by clang, which required rethinking which elements of the
QtConcurrent API should be visible to clangqdoc. The basic
problem is that clang must see declarations for all types
used by a type, or else it either gets lost and fails to
parse a type correctly, or it simply refuses to include
the type in its AST.

Change-Id: Iaa699c287e67d1288fcb2d83a9dbbaf07521d0cc
Reviewed-by: Martin Smith <martin.smith@qt.io>
---
 src/concurrent/qtconcurrentiteratekernel.cpp | 50 +++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

(limited to 'src/concurrent/qtconcurrentiteratekernel.cpp')

diff --git a/src/concurrent/qtconcurrentiteratekernel.cpp b/src/concurrent/qtconcurrentiteratekernel.cpp
index 52218f794bb..11bdb7e8cd0 100644
--- a/src/concurrent/qtconcurrentiteratekernel.cpp
+++ b/src/concurrent/qtconcurrentiteratekernel.cpp
@@ -43,7 +43,7 @@
 #include "private/qfunctions_p.h"
 
 
-#ifndef QT_NO_CONCURRENT
+#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC)
 
 QT_BEGIN_NAMESPACE
 
@@ -64,6 +64,54 @@ static double elapsed(qint64 after, qint64 before)
 
 namespace QtConcurrent {
 
+/*!
+  \class QtConcurrent::Median
+  \inmodule QtConcurrent
+  \internal
+ */
+
+/*!
+  \class QtConcurrent::MedianDouble
+  \inmodule QtConcurrent
+  \internal
+ */
+
+/*!
+  \class QtConcurrent::BlockSizeManager
+  \inmodule QtConcurrent
+  \internal
+ */
+
+/*!
+  \class QtConcurrent::BlockSizeManagerV2
+  \inmodule QtConcurrent
+  \internal
+ */
+
+/*!
+  \class QtConcurrent::ResultReporter
+  \inmodule QtConcurrent
+  \internal
+ */
+
+/*! \fn bool QtConcurrent::selectIteration(std::bidirectional_iterator_tag)
+  \internal
+ */
+
+/*! \fn bool QtConcurrent::selectIteration(std::forward_iterator_tag)
+  \internal
+ */
+
+/*! \fn bool QtConcurrent::selectIteration(std::random_access_iterator_tag)
+  \internal
+ */
+
+/*!
+  \class QtConcurrent::IterateKernel
+  \inmodule QtConcurrent
+  \internal
+ */
+
 /*! \internal
 
 */
-- 
cgit v1.2.3