From 9090e0d9c6b8e16b206a2e0ed9ddbc3e1d0c2c68 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 10 Jul 2012 14:44:15 +0200 Subject: qcompilerdetection.h: add MSVC 2012 features These are taken from the table at http://blogs.msdn.com/b/vcblog/archive/2011/09/12/10209291.aspx Change-Id: Ifd2f88ca5d92092a6a025bef3da36fde0a802a66 Reviewed-by: Olivier Goffart --- src/corelib/global/qcompilerdetection.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/corelib/global/qcompilerdetection.h') diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 2faa6bf066..56cf25bb38 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -657,6 +657,13 @@ // MSVC has std::initilizer_list, but does not support the braces initialization //# define Q_COMPILER_INITIALIZER_LISTS # endif +# if _MSC_VER >= 1700 + /* C++11 features supported in VC11 = VC2012: */ +# define Q_COMPILER_EXPLICIT_OVERRIDES +# define Q_COMPILER_RANGE_FOR +# define Q_COMPILER_CLASS_ENUM +# define Q_COMPILER_ATOMICS +# endif /* VC 11 */ #endif /* Q_CC_MSVC */ #ifdef __cplusplus -- cgit v1.2.3