From cf5b3c18ddff1f7edd8ff53e0db195e2d746fc01 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 24 Jan 2012 18:36:51 +0100 Subject: Remove Q_COMPILER_FINAL 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 Reviewed-by: Thiago Macieira --- src/corelib/global/qglobal.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 8ae8dba8b1..66628317e1 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -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 -- cgit v1.2.3