summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-03-14 17:37:15 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-24 03:24:52 +0100
commitfa62b6c73ee530033f7f47182067225e40b54da8 (patch)
tree153395a5458b1007689d2c1f54460789d6220f08 /src/corelib
parentf226e7e6315745705b153268e18defdeccb41a03 (diff)
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/tools/qsimd.cpp2
1 files changed, 1 insertions, 1 deletions
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 <intrin.h>
# 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_*