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/qtconcurrentexception.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/qtconcurrentexception.h')
-rw-r--r-- | src/concurrent/qtconcurrentexception.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/concurrent/qtconcurrentexception.h b/src/concurrent/qtconcurrentexception.h index 03dd7ec498..3ed4ac2cf5 100644 --- a/src/concurrent/qtconcurrentexception.h +++ b/src/concurrent/qtconcurrentexception.h @@ -42,7 +42,7 @@ #include <QtConcurrent/qtconcurrent_global.h> -#ifndef QT_NO_QFUTURE +#if !defined(QT_NO_QFUTURE) || defined(Q_CLANG_QDOC) #include <QtCore/qexception.h> @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE namespace QtConcurrent { -#ifndef QT_NO_EXCEPTIONS +#if !defined(QT_NO_EXCEPTIONS) || defined(Q_CLANG_QDOC) typedef Q_DECL_DEPRECATED QException Exception; typedef Q_DECL_DEPRECATED QUnhandledException UnhandledException; |