From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Tue, 12 Jul 2011 14:13:26 +0000 (+0200)
Subject: Fix compilation with icc 11
X-Git-Tag: qt-v5.0.0-alpha1~4001
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1bedbb3706e9b0427c019d5dedbefd3984517f33;p=profile%2Fivi%2Fqtbase.git

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>
---

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index e8e736d..e91e8af 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