aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2011-10-20 21:23:32 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-04 06:00:40 +0200
commitd870965949af8298e18fc5d86a2510c3fd85f884 (patch)
treeb69f8d4c1dc577f16e46998093f43dff8e5813d6 /src
parent69c23b2126a8868b3d031b64e340bb891814a39a (diff)
Use the GCC pragma on GCC only
Change-Id: I4a0680bddb4d4a73362406ddcd30569ee664d0cc Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/qml/qml/v8/qv8qobjectwrapper.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp
index d31121803e..b2a1d25518 100644
--- a/src/qml/qml/v8/qv8qobjectwrapper.cpp
+++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp
@@ -63,7 +63,7 @@ Q_DECLARE_METATYPE(QQmlV8Handle);
QT_BEGIN_NAMESPACE
-#if defined(__GNUC__)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 405
// The code in this file does not violate strict aliasing, but GCC thinks it does
// so turn off the warnings for us to have a clean build