From fa62b6c73ee530033f7f47182067225e40b54da8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 14 Mar 2013 17:37:15 +0100 Subject: match #ifdefs relating to arm compilation use the same conditional around the #include as the actual code below uses, otherwise we risk mismatches. Change-Id: I8ca32c0178b1970928626a927948b06d4c6d31b9 Reviewed-by: Thiago Macieira --- src/corelib/tools/qsimd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/tools') diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index f2cb5e88ee..97a64eb5bb 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -54,7 +54,7 @@ # include # endif # endif -#elif defined(Q_OS_LINUX) && defined(__arm__) +#elif defined(Q_OS_LINUX) && (defined(Q_PROCESSOR_ARM) || defined(QT_COMPILER_SUPPORTS_IWMMXT) || defined(QT_COMPILER_SUPPORTS_NEON)) #include "private/qcore_unix_p.h" // the kernel header definitions for HWCAP_* -- cgit v1.2.3