diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-06-16 15:25:44 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-06-18 11:54:09 +0200 |
| commit | 59b03992ab332a320ac7cff7c5b099b2c30e14b2 (patch) | |
| tree | f7be2ed2aac88d63834f20263f1ee400a62e4acf /src/corelib/global/qglobal.h | |
| parent | f63c810485b2d54e18d3012a1c434fc2ba134e84 (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.
Pick-to: 5.15
Change-Id: Ibe73ff5e7b5aa5eff93d0c4c0a38a33855a9a330
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
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 7b2b6846f2..bbcb1d5880 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -302,6 +302,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 |