AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undef Q_DECL_ENUMERATOR_DEPRECATED when having no deprecation warnings

Browse Source 
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>
This commit is contained in:
Andy Shaw 2020-06-16 15:25:44 +02:00
parent f63c810485
commit 59b03992ab
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qglobal.h
View File

@ -302,6 +302,8 @@ typedef double qreal;
# define QT_DEPRECATED_VARIABLE # define QT_DEPRECATED_VARIABLE
# undef QT_DEPRECATED_CONSTRUCTOR # undef QT_DEPRECATED_CONSTRUCTOR
# define QT_DEPRECATED_CONSTRUCTOR # define QT_DEPRECATED_CONSTRUCTOR
# undef Q_DECL_ENUMERATOR_DEPRECATED
# define Q_DECL_ENUMERATOR_DEPRECATED
#endif #endif
#ifndef QT_DEPRECATED_WARNINGS_SINCE #ifndef QT_DEPRECATED_WARNINGS_SINCE