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

Add defines for explicit virtual overrides.

Browse Source 
Change-Id: Ia9a610e81eeaaa0a08ca6ef4945b002bdb13fe8a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Stephen Kelly 2012-01-08 19:58:43 +01:00 committed by Qt by Nokia
parent 20abd88e71
commit c11cb16f3f
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -520,6 +520,11 @@ namespace QT_NAMESPACE {}
# define Q_COMPILER_UNRESTRICTED_UNIONS # define Q_COMPILER_UNRESTRICTED_UNIONS
# define Q_COMPILER_RANGE_FOR # define Q_COMPILER_RANGE_FOR
# endif # endif
# 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 # endif
@ -1083,6 +1088,18 @@ redefine to built-in booleans to make autotests work properly */
# define Q_DECL_CONSTEXPR # define Q_DECL_CONSTEXPR
#endif #endif
#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_FINAL
#endif
//defines the type for the WNDPROC on windows //defines the type for the WNDPROC on windows
//the alignment needs to be forced for sse2 to not crash with mingw //the alignment needs to be forced for sse2 to not crash with mingw
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)