diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-07-12 16:13:26 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-12 17:02:38 +0200 |
| commit | 1bedbb3706e9b0427c019d5dedbefd3984517f33 (patch) | |
| tree | ca3a5f7c8922732643c754d74b03e5cd6bc3a6cd /src/corelib | |
| parent | 2b5dcfcee118265ef7930cc7c5c16bff22d580fd (diff) | |
Fix compilation with icc 11
Rvalues reference are not supported by icc11 yet.
Disable all C++0x feature on that compiler.
Task-number: QTBUG-19979
Change-Id: Ifca939b18aa933b047883584cdf91f5543b852b5
Reviewed-by: Thiago
Reviewed-on: http://codereview.qt.nokia.com/1535
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index e8e736d4f3..e91e8afdbc 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -812,11 +812,10 @@ namespace QT_NAMESPACE {} # define Q_NO_TEMPLATE_FRIENDS # endif # if defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__) -# if __INTEL_COMPILER >= 1100 +# if __INTEL_COMPILER >= 1200 # define Q_COMPILER_RVALUE_REFS # define Q_COMPILER_EXTERN_TEMPLATES # define Q_COMPILER_DECLTYPE -# elif __INTEL_COMPILER >= 1200 # define Q_COMPILER_VARIADIC_TEMPLATES # define Q_COMPILER_AUTO_TYPE # define Q_COMPILER_DEFAULT_DELETE_MEMBERS |