diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-14 10:35:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-14 10:35:51 +0200 |
| commit | 7c495cfea96e13dbd8b4f9bfa2fc8ee5d015597f (patch) | |
| tree | e64c56e73d11c1f0640b280a60c556e0aec557a4 /src/corelib/global | |
| parent | 607462019a1da6241d3f4b6bf6356b7dc0a413d0 (diff) | |
| parent | b61ee210e67e5575bc96489908b9c46f7b74ec7a (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/gui/text/qfontengine_qpf2.cpp
Change-Id: Ib04f92c41d0edd55d3aef8fb1708d917fba0f2a8
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 0f9a821e40..24c5bfa741 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -530,7 +530,8 @@ # define Q_COMPILER_NOEXCEPT # endif # if __INTEL_COMPILER >= 1400 -# define Q_COMPILER_CONSTEXPR +// causes issues with QArrayData and QtPrivate::RefCount - Intel issue ID 6000056211, bug DPD200534796 +//# define Q_COMPILER_CONSTEXPR # define Q_COMPILER_DELEGATING_CONSTRUCTORS # define Q_COMPILER_EXPLICIT_CONVERSIONS # define Q_COMPILER_EXPLICIT_OVERRIDES |