diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-10-30 22:44:13 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-03 18:09:17 +0100 |
| commit | 1eb7005850b9f54c30b34bd1268d2314767131fe (patch) | |
| tree | 45d888a71db60c01d3b6724eb3a8eadebc88cdf0 /doc/global | |
| parent | 63a512023e861380f4489b103212769b741a93dc (diff) | |
Use the new warning enabling/disabling macros in qtbase
Change-Id: I91ff06644e8047c2ca483f9768b46c1372eb6171
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Diffstat (limited to 'doc/global')
| -rw-r--r-- | doc/global/qt-cpp-defines.qdocconf | 8 |
1 files changed, 7 insertions, 1 deletions
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 |