summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-09-08 16:30:28 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-08 17:24:18 +0200
commit1616001d72483d236a0430e6b4ac7bf18c979099 (patch)
tree452eb99f4915dccd6efc2482ead07686e4290559
parentbc420e87e634d6f114e240430bf3228dc3beee21 (diff)
Add support for the Intel Composer XE 2013.
ICC 13.0 adds some new C++11 features that we can now support. Change-Id: Ia870a3bb0172ff124983725300e8f9bf2e325ec6 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
-rw-r--r--src/corelib/global/qcompilerdetection.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
index b76a2ed978..42c7d04128 100644
--- a/src/corelib/global/qcompilerdetection.h
+++ b/src/corelib/global/qcompilerdetection.h
@@ -483,6 +483,12 @@
# define Q_COMPILER_UNICODE_STRINGS
# define Q_COMPILER_VARIADIC_TEMPLATES
# endif
+# if __INTEL_COMPILER >= 1300
+// constexpr support is only partial
+//# define Q_COMPILER_CONSTEXPR
+# define Q_COMPILER_INITIALIZER_LISTS
+# define Q_COMPILER_NOEXCEPT
+# endif
# endif
#endif