diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-06-16 15:25:44 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-06-18 14:43:20 +0000 |
| commit | 970029861ad2b048537b549230d54c527db3e9bb (patch) | |
| tree | d15de9cbf7fedb5348210b8a21f68040faa6bfcb /src/corelib/global/qglobal.h | |
| parent | 6b05970cd7e1efabc3419c6df7abd2c9c31f6c44 (diff) | |
Undef Q_DECL_ENUMERATOR_DEPRECATED when having no deprecation warnings
Since Q_DECL_ENUMERATOR_DEPRECATED can be explicitly set to something
other than QT_DEPRECATED, then it needs to be explicitly undefined
when QT_NO_DEPRECATED_WARNINGS is used to prevent it from showing a
warning.
Change-Id: Ibe73ff5e7b5aa5eff93d0c4c0a38a33855a9a330
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 59b03992ab332a320ac7cff7c5b099b2c30e14b2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 35c0482768..447f60dfb2 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -305,6 +305,8 @@ typedef double qreal; # define QT_DEPRECATED_VARIABLE # undef QT_DEPRECATED_CONSTRUCTOR # define QT_DEPRECATED_CONSTRUCTOR +# undef Q_DECL_ENUMERATOR_DEPRECATED +# define Q_DECL_ENUMERATOR_DEPRECATED #endif #ifndef QT_DEPRECATED_WARNINGS_SINCE |