summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2017-04-27 14:05:23 +0200
committerTopi Reiniƶ <topi.reinio@qt.io>2017-04-28 07:59:00 +0000
commitce9dc06b4c120ce6c32eeea71bc2c62dff32b047 (patch)
tree017f7c0ba962dd34c1d035f79d1d6b8695e41789 /doc
parent11e37a0e8c9e2c17d13b1ab44ca9b3f35b7a9844 (diff)
qdoc: Reintroduce Q_OS_* defines into the global documentation config
This was dropped by commit 740ff1b8 in preparation for clang-based C++ parser in qdoc. However, the old (current) parser still needs it, as some of the functions to document are wrapped with those macros. It does not interfere with the clang parser anyway; unlike the old parser, clang will not resolve the wildcards in macros. Change-Id: I3135a263e8eb200a11b1e918c776e3a2c3ec5fb6 Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/global/qt-cpp-defines.qdocconf1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf
index c8e6463eb7..df25d15448 100644
--- a/doc/global/qt-cpp-defines.qdocconf
+++ b/doc/global/qt-cpp-defines.qdocconf
@@ -14,6 +14,7 @@ defines += Q_QDOC \
QT_DEPRECATED_* \
Q_NO_USING_KEYWORD \
__cplusplus \
+ Q_OS_.* \
Q_STDLIB_UNICODE_STRINGS \
Q_COMPILER_INITIALIZER_LISTS \
Q_COMPILER_UNICODE_STRINGS \