From 0ec953c93688ec0de74cda43b91f66f4cf879e5f Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 2 Aug 2012 22:43:02 +0200 Subject: [PATCH] Remove extra Q_COMPILER_xxx defines from the MSVC section. Those are defined below, after the list that describes the macros and the papers. Change-Id: I1f2df0e33c84eb17ebbb0147662f560defed182c Reviewed-by: Marius Storm-Olsen --- src/corelib/global/qcompilerdetection.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 9a9e78b44f..64aae8acb2 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -114,17 +114,6 @@ # define Q_DECL_NOEXCEPT throw() # define Q_DECL_NOEXCEPT_EXPR(x) -#if defined(Q_CC_MSVC) && _MSC_VER >= 1600 -# define Q_COMPILER_RVALUE_REFS -# define Q_COMPILER_AUTO_TYPE -# define Q_COMPILER_LAMBDA -# define Q_COMPILER_DECLTYPE -# define Q_COMPILER_STATIC_ASSERT -// MSCV has std::initilizer_list, but do not support the braces initialization -//# define Q_COMPILER_INITIALIZER_LISTS -# endif - - #elif defined(__BORLANDC__) || defined(__TURBOC__) # define Q_CC_BOR # define Q_INLINE_TEMPLATE