diff options
Diffstat (limited to 'src/corelib/global/qcompilerdetection.h')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 273575c31f4..bfa4f89105f 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1114,10 +1114,8 @@ # define Q_DECL_DEPRECATED_X(x) [[deprecated(x)]] #endif -#if defined(__cpp_enumerator_attributes) && __cpp_enumerator_attributes >= 201411 -# define Q_DECL_ENUMERATOR_DEPRECATED Q_DECL_DEPRECATED -# define Q_DECL_ENUMERATOR_DEPRECATED_X(x) Q_DECL_DEPRECATED_X(x) -#endif +#define Q_DECL_ENUMERATOR_DEPRECATED Q_DECL_DEPRECATED +#define Q_DECL_ENUMERATOR_DEPRECATED_X(x) Q_DECL_DEPRECATED_X(x) /* * Fallback macros to certain compiler features @@ -1153,12 +1151,6 @@ #ifndef Q_DECL_DEPRECATED_X # define Q_DECL_DEPRECATED_X(text) Q_DECL_DEPRECATED #endif -#ifndef Q_DECL_ENUMERATOR_DEPRECATED -# define Q_DECL_ENUMERATOR_DEPRECATED -#endif -#ifndef Q_DECL_ENUMERATOR_DEPRECATED_X -# define Q_DECL_ENUMERATOR_DEPRECATED_X(x) -#endif #ifndef Q_DECL_EXPORT # define Q_DECL_EXPORT #endif |