From 1658bcb1047ab04d500683f94ecda74bf660d2af Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@qt.io>
Date: Fri, 2 Dec 2016 09:51:52 +0100
Subject: 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>
---
 doc/global/qt-cpp-defines.qdocconf | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc/global/qt-cpp-defines.qdocconf')

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 \
-- 
cgit v1.2.3