diff options
author | Martin Smith <martin.smith@qt.io> | 2017-03-09 14:18:46 +0100 |
---|---|---|
committer | Martin Smith <martin.smith@qt.io> | 2017-12-06 10:02:31 +0000 |
commit | aefb3a9a076a6df1076cf8bf4f2a3b0c8993f6ee (patch) | |
tree | 5ce9e37e28475336ac539ae78e88d5ba987d59c2 /src/corelib/thread/qexception.cpp | |
parent | ceccdff4e9fc93819d819b8ed15d95822f980505 (diff) |
doc: Ensure clangqdoc sees declarations
This update corrects several uses of #ifdef macros
that needed updating because qdoc now uses clang to
parse header files.
Change-Id: I285efa4629a1a5d5bcbfaf701eeafbd0e9f1e43e
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'src/corelib/thread/qexception.cpp')
-rw-r--r-- | src/corelib/thread/qexception.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/thread/qexception.cpp b/src/corelib/thread/qexception.cpp index e00181e64b..aed8d91a0a 100644 --- a/src/corelib/thread/qexception.cpp +++ b/src/corelib/thread/qexception.cpp @@ -40,8 +40,8 @@ #include "qexception.h" #include "QtCore/qshareddata.h" -#ifndef QT_NO_QFUTURE -#ifndef QT_NO_EXCEPTIONS +#if !defined(QT_NO_QFUTURE) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_EXCEPTIONS) || defined(Q_CLANG_QDOC) QT_BEGIN_NAMESPACE @@ -155,7 +155,7 @@ QUnhandledException *QUnhandledException::clone() const return new QUnhandledException(*this); } -#ifndef Q_QDOC +#if !defined(Q_CLANG_QDOC) namespace QtPrivate { @@ -220,7 +220,7 @@ bool ExceptionStore::hasThrown() const { return exceptionHolder.base->hasThrown; } // namespace QtPrivate -#endif //Q_QDOC +#endif //Q_CLANG_QDOC QT_END_NAMESPACE |