summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@qt.io>2016-10-21 10:27:02 +0200
committerMartin Smith <martin.smith@qt.io>2017-01-07 18:51:12 +0000
commit740ff1b881059d18f036c7b021674d0cd11c9014 (patch)
tree045e4b13c0b0ffb11c6740dedf59f488be8a12db /doc
parent4f24e30f5711314c8ada7c203e62c0dab76e708a (diff)
qdoc: Remove Q_OS_* frome defines variable
In clangqdoc, we no longer define platform-specific macros, because they make clang try to include too much include stuff. Instead, when we have something like #if defined(Q_OS_XXX) surrounding something we want clangqdoc to see, we add the Q_CLANG_QDOC macro like this: #if defined(Q_OS_XXX) || defined(Q_CLANG_QDOC). This should not be done everywhere Q_OS_XXX is used, but only where there is some platform-specific things we want to document. Change-Id: I97bb57e9b0c044899fa45b0beb02702906d5c89a Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/global/qt-cpp-defines.qdocconf2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf
index c6a8fa1be1..2f9c873b34 100644
--- a/doc/global/qt-cpp-defines.qdocconf
+++ b/doc/global/qt-cpp-defines.qdocconf
@@ -8,7 +8,7 @@ defines += Q_QDOC \
QT_KEYPAD_NAVIGATION \
QT_NO_EGL \
QT3_SUPPORT \
- Q_OS_.* \
+ Q_DEAD_CODE_FROM_QT4_.* \
Q_BYTE_ORDER \
QT_DEPRECATED \
QT_DEPRECATED_* \