summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2012-07-10 14:44:15 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-26 14:29:48 +0200
commit9090e0d9c6b8e16b206a2e0ed9ddbc3e1d0c2c68 (patch)
treed40c9db7f0bca533d422c5b337abf56238e360a8 /src
parentbf186ceebb1801fb2af9b71182402bc80ebfc74a (diff)
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 <ogoffart@woboq.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qcompilerdetection.h7
1 files changed, 7 insertions, 0 deletions
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