From 2de8ef2e49d1a14b5d4acf7bfd9539dadbcbc54f Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 18 Jun 2014 15:38:35 -0700
Subject: Fix compilation with the Intel compiler on certain systems

We require the intrinsics from immintrin.h, so include it
unconditioanlly with that compiler.

Change-Id: I4a17676631f9d89e2d22e486f40c9b177ca06c1e
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
 src/corelib/tools/qsimd_p.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/corelib/tools')

diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index f4ca971567..e1c22bac71 100644
--- a/src/corelib/tools/qsimd_p.h
+++ b/src/corelib/tools/qsimd_p.h
@@ -139,8 +139,10 @@
     || (defined(Q_CC_CLANG) && (__clang_major__ * 100 + __clang_minor__ >= 208)) \
     || defined(Q_CC_INTEL))
 #  define QT_COMPILER_SUPPORTS_X86INTRIN
-#  ifndef Q_CC_INTEL
+#  ifdef Q_CC_INTEL
 // The Intel compiler has no <x86intrin.h> -- all intrinsics are in <immintrin.h>;
+#    include <immintrin.h>
+#  else
 // GCC 4.4 and Clang 2.8 added a few more intrinsics there
 #    include <x86intrin.h>
 #  endif
-- 
cgit v1.2.3