diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-01-02 17:45:30 -0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-01-06 17:36:49 +0100 |
| commit | 01fc82e3574614762d2ce061dd45ce4995c79e7f (patch) | |
| tree | c22f2cb719308820c85c62ad11631b1c43aa39df /src/corelib/global/qcompilerdetection.h | |
| parent | f3e9f11265bc6715d4d1c6e2d734fad923b10d05 (diff) | |
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>
Diffstat (limited to 'src/corelib/global/qcompilerdetection.h')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 |