summaryrefslogtreecommitdiffstats
path: root/doc/global/qt-cpp-defines.qdocconf
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2016-12-14 12:57:28 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2016-12-15 05:20:16 +0000
commit6b79e18f172c6ffc8811fc4b60ebe54fdfb999f1 (patch)
treea3273874e2a266812bc6004a69a317d681259f9e /doc/global/qt-cpp-defines.qdocconf
parentb08bdfb2e4de1f0b01e771dcd6d65afea0cbdd24 (diff)
qdoc: Ignore macro QT_WARNING_DISABLE_DEPRECATED
This macro, introduced in Qt 5.8, needs to be ignored by QDoc in order to generate documentation correctly for a number of deprecated functions. Change-Id: I50bcd42167e3fafb7dda88484fde86e1aebb5980 Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'doc/global/qt-cpp-defines.qdocconf')
-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 4aa9111853..73bd8559d0 100644
--- a/doc/global/qt-cpp-defines.qdocconf
+++ b/doc/global/qt-cpp-defines.qdocconf
@@ -122,6 +122,7 @@ Cpp.ignoretokens += \
QT_END_NAMESPACE \
QT_FASTCALL \
QT_MUTEX_LOCK_NOEXCEPT \
+ QT_WARNING_DISABLE_DEPRECATED \
QT_WARNING_PUSH \
QT_WARNING_POP \
QT_WIDGET_PLUGIN_EXPORT \