summaryrefslogtreecommitdiffstats
path: root/src/concurrent/qtconcurrentmedian.h
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@qt.io>2017-01-13 12:12:06 +0100
committerMartin Smith <martin.smith@qt.io>2017-12-08 14:06:02 +0000
commit4f9575ecbcfd40252b9ad28092e815efe9e824da (patch)
tree1dfc37603d2dc0019d29ad48e0d417032ade1b59 /src/concurrent/qtconcurrentmedian.h
parentd3af09fdb20eef52a85dfedf71517863242a63a0 (diff)
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>
Diffstat (limited to 'src/concurrent/qtconcurrentmedian.h')
-rw-r--r--src/concurrent/qtconcurrentmedian.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/concurrent/qtconcurrentmedian.h b/src/concurrent/qtconcurrentmedian.h
index d0f832812c..87e6b2935d 100644
--- a/src/concurrent/qtconcurrentmedian.h
+++ b/src/concurrent/qtconcurrentmedian.h
@@ -42,7 +42,7 @@
#include <QtConcurrent/qtconcurrent_global.h>
-#ifndef QT_NO_CONCURRENT
+#if !defined(QT_NO_CONCURRENT) ||defined(Q_CLANG_QDOC)
#include <QtCore/qvector.h>
@@ -51,7 +51,6 @@
QT_BEGIN_NAMESPACE
-#ifndef Q_QDOC
namespace QtConcurrent {
@@ -195,7 +194,6 @@ private:
} // namespace QtConcurrent
-#endif //Q_QDOC
QT_END_NAMESPACE