diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2018-03-08 13:05:04 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2018-03-08 14:10:30 +0000 |
| commit | 93a4741490aed8e123ebf2b566d99e6d7c35a8d8 (patch) | |
| tree | 5f8bfeff0bef49df0c2d56c0f02d02e4b3ded304 | |
| parent | be7e45ca259d70d5f2ef0d11460261146fc1df95 (diff) | |
Fix documentation build when using Clang-enabled QDoc
QDoc in Qt 5.11 uses Clang to parse the C++ documentation.
Ignore the custom namespace used for Qt Data Visualization when
Clang is used - this resolves all documentation warnings and
generates it as it did on Qt 5.10.
Change-Id: I331bdb07611eb97f1df1896468d11c9341156739
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
| -rw-r--r-- | src/datavisualization/global/qdatavisualizationglobal.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index a1c31a93..1755ba21 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -52,7 +52,12 @@ # define QT_DATAVISUALIZATION_EXPORT #endif +#ifndef Q_CLANG_QDOC #define QT_BEGIN_NAMESPACE_DATAVISUALIZATION namespace QtDataVisualization { #define QT_END_NAMESPACE_DATAVISUALIZATION } +#else /* Let documentation be generated with the standard Qt namespace */ +#define QT_BEGIN_NAMESPACE_DATAVISUALIZATION QT_BEGIN_NAMESPACE +#define QT_END_NAMESPACE_DATAVISUALIZATION QT_END_NAMESPACE +#endif // Q_CLANG_QDOC #endif |