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

Remove Q_COMPILER_FINAL

Browse Source 
Merge it with Q_COMPILER_EXPLICIT_OVERRIDES

No compiler will implement one and not the other,
"overrideS" is a shortcut for the two features

It was even wrongly not defined with clang

Change-Id: I22dcffe6f0c96285c2b409a5ae9ce2f6f1652094
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Olivier Goffart 2012-01-24 18:36:51 +01:00 committed by Qt by Nokia
parent 992e50e421
commit cf5b3c18dd
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -513,7 +513,6 @@ namespace QT_NAMESPACE {}
# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 407
/* C++0x features supported in GCC 4.7: */
# define Q_COMPILER_EXPLICIT_OVERRIDES
# define Q_COMPILER_FINAL
# endif
# endif
@ -805,7 +804,6 @@ namespace QT_NAMESPACE {}
# if 0 /*) not implemented in clang */
# define Q_COMPILER_ATOMICS
# define Q_COMPILER_CONSTEXPR
# define Q_COMPILER_FINAL
# define Q_COMPILER_INITIALIZER_LISTS
# define Q_COMPILER_LAMBDA
# define Q_COMPILER_UNRESTRICTED_UNIONS
@ -1108,13 +1106,9 @@ QT_END_INCLUDE_NAMESPACE
#ifdef Q_COMPILER_EXPLICIT_OVERRIDES
# define Q_DECL_OVERRIDE override
#else
# define Q_DECL_OVERRIDE
#endif
#ifdef Q_COMPILER_FINAL
# define Q_DECL_FINAL final
#else
# define Q_DECL_OVERRIDE
# define Q_DECL_FINAL
#endif