From 01fc82e3574614762d2ce061dd45ce4995c79e7f Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Fri, 2 Jan 2015 17:45:30 -0200
Subject: [PATCH] Re-enable constexpr for ICC 15

The bug noted in d88e4edcd548e5bb024e75016c5a3449d103bd8d appears to be
resolved.

Change-Id: Id20906ff83f74bd16267d44bf447626b81187e71
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/corelib/global/qcompilerdetection.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
index 5f8ca5c7cc..36ba57a0ff 100644
--- a/src/corelib/global/qcompilerdetection.h
+++ b/src/corelib/global/qcompilerdetection.h
@@ -553,6 +553,7 @@
 #      define Q_COMPILER_UNRESTRICTED_UNIONS
 #    endif
 #    if __INTEL_COMPILER >= 1500
+#      define Q_COMPILER_CONSTEXPR
 #      define Q_COMPILER_ALIGNAS
 #      define Q_COMPILER_ALIGNOF
 #      define Q_COMPILER_INHERITING_CONSTRUCTORS