diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-02-11 11:19:32 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-12 01:41:39 +0100 |
| commit | 8e22d71b225576ae7ccd6ed349c05219bae7689e (patch) | |
| tree | c230cbded84debf99f2060fea1647e0950669a0d | |
| parent | fd00bfc788f23518ae68293d5b97cf9361a9d2a9 (diff) | |
Disable disabling exceptions with ICC
There's a bug found in ICC 14.0 that causes the compiler to assert when
compiling QtDeclarative. Let's leave this here until at least one year
after the fix is released.
Intel task: DPD200253124
Task-number: QTBUG-36577
Change-Id: I76d4b41da7e60397dac65862a3a6ec024b840744
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | mkspecs/linux-icc/qmake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index ee5f1f0ea4..000632069a 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf @@ -44,7 +44,8 @@ QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions +# Disabling exceptions disabled - workaround for QTBUG-36577 +#QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions QMAKE_CXXFLAGS_CXX11 = -std=c++0x QMAKE_INCDIR = |