From 59b03992ab332a320ac7cff7c5b099b2c30e14b2 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 16 Jun 2020 15:25:44 +0200 Subject: 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 --- src/corelib/global/qglobal.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/corelib/global/qglobal.h') 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 -- cgit v1.2.3