From 1eb7005850b9f54c30b34bd1268d2314767131fe Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 30 Oct 2014 22:44:13 -0700 Subject: Use the new warning enabling/disabling macros in qtbase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I91ff06644e8047c2ca483f9768b46c1372eb6171 Reviewed-by: Martin Smith Reviewed-by: Jędrzej Nowacki --- doc/global/qt-cpp-defines.qdocconf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (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 e806a00480..cf84a6ee6e 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -116,6 +116,8 @@ Cpp.ignoretokens += \ QT_END_NAMESPACE \ QT_FASTCALL \ QT_MUTEX_LOCK_NOEXCEPT \ + QT_WARNING_PUSH \ + QT_WARNING_POP \ QT_WIDGET_PLUGIN_EXPORT \ QWEBKIT_EXPORT @@ -144,4 +146,8 @@ Cpp.ignoredirectives += \ Q_PRIVATE_PROPERTY \ QT_FORWARD_DECLARE_CLASS \ Q_DECLARE_HANDLE \ - Q_REVISION + Q_REVISION \ + QT_WARNING_DISABLE_CLANG \ + QT_WARNING_DISABLE_GCC \ + QT_WARNING_DISABLE_INTEL \ + QT_WARNING_DISABLE_MSVC -- cgit v1.2.3