diff options
| author | Martin Smith <martin.smith@qt.io> | 2017-01-13 12:12:06 +0100 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2017-12-08 14:06:02 +0000 |
| commit | 4f9575ecbcfd40252b9ad28092e815efe9e824da (patch) | |
| tree | 1dfc37603d2dc0019d29ad48e0d417032ade1b59 /src/concurrent/qtconcurrentrun.h | |
| parent | d3af09fdb20eef52a85dfedf71517863242a63a0 (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/qtconcurrentrun.h')
| -rw-r--r-- | src/concurrent/qtconcurrentrun.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/concurrent/qtconcurrentrun.h b/src/concurrent/qtconcurrentrun.h index c0c0e66913..7963294ebf 100644 --- a/src/concurrent/qtconcurrentrun.h +++ b/src/concurrent/qtconcurrentrun.h @@ -43,15 +43,16 @@ #include <QtConcurrent/qtconcurrentcompilertest.h> -#ifndef QT_NO_CONCURRENT +#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) #include <QtConcurrent/qtconcurrentrunbase.h> #include <QtConcurrent/qtconcurrentstoredfunctioncall.h> QT_BEGIN_NAMESPACE +#ifdef Q_CLANG_QDOC -#ifdef Q_QDOC +typedef int Function; namespace QtConcurrent { @@ -919,7 +920,7 @@ QFuture<T> run(QThreadPool *pool, const Class *object, T (Class::*fn)(Param1, Pa } //namespace QtConcurrent -#endif // Q_QDOC +#endif // Q_CLANG_QDOC QT_END_NAMESPACE |