summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2016-12-02 09:51:52 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2016-12-04 07:26:02 +0000
commit1658bcb1047ab04d500683f94ecda74bf660d2af (patch)
tree09c0a181eb6d448c20a1b71912f2e4d7e30d0b7a /doc
parent048447346bc1b78992be3ce4bf3292fc272f7e1a (diff)
qdoc: Ignore Q_ALWAYS_INLINE and QT_HAS_INCLUDE()
Number of API changes in Qt 5.8 use these macros and QDoc needs to ignore them the correctly match the documentation to the function signatures. Task-number: QTBUG-57424 Change-Id: I0c3a0eb4deb2d9b348f24800591bc6f6b47cf458 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/global/qt-cpp-defines.qdocconf2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf
index fe8b7fb87e..4aa9111853 100644
--- a/doc/global/qt-cpp-defines.qdocconf
+++ b/doc/global/qt-cpp-defines.qdocconf
@@ -20,6 +20,7 @@ defines += Q_QDOC \
Cpp.ignoretokens += \
ENGINIOCLIENT_EXPORT \
PHONON_EXPORT \
+ Q_ALWAYS_INLINE \
Q_AUTOTEST_EXPORT \
Q_BLUETOOTH_EXPORT \
Q_COMPAT_EXPORT \
@@ -150,6 +151,7 @@ Cpp.ignoredirectives += \
Q_ENUMS \
Q_FLAG \
Q_FLAGS \
+ QT_HAS_INCLUDE \
Q_INTERFACES \
Q_PRIVATE_PROPERTY \
QT_FORWARD_DECLARE_CLASS \