summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2015-11-16 13:44:12 -0800
committerThiago Macieira <thiago.macieira@intel.com>2015-11-18 00:30:47 +0000
commit3dd6ac244fce7ed5f09910b427eaf0eac338be4b (patch)
tree35953b19e8279755459d6f9b08e949fe1686c2e0 /src/corelib
parent7ad560b2bcae2d85aead0693219dd49233f8c9e4 (diff)
Add support for the C++11 features fixed in MSVC 2015 Update 1
This brings MSVC 2015 support to almost C++11 feature completion. Constexpr support still has one annoying bug, for which the fix is promised for Update 2. Change-Id: I92c2ee6638625c61e3a16690563434e32d853368 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib')
-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 2ff75d7561..ba830977ad 100644
--- a/src/corelib/global/qcompilerdetection.h
+++ b/src/corelib/global/qcompilerdetection.h
@@ -914,6 +914,13 @@
//# define Q_COMPILER_UNIFORM_INIT
# define Q_COMPILER_UNRESTRICTED_UNIONS
# endif
+# if _MSC_FULL_VER >= 190023419
+# define Q_COMPILER_ATTRIBUTES
+// Almost working, see https://connect.microsoft.com/VisualStudio/feedback/details/2011648
+//# define Q_COMPILER_CONSTEXPR
+# define Q_COMPILER_THREADSAFE_STATICS
+# define Q_COMPILER_UNIFORM_INIT
+# endif
# endif /* __cplusplus */
#endif /* Q_CC_MSVC */