summaryrefslogtreecommitdiffstats
path: root/config.tests
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2015-11-27 13:00:01 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-11-27 17:43:53 +0000
commit69817f6ad13e94ed51b15488b18bafe9b7f44c26 (patch)
treeb2ac7843ac557dc071560518fc9c705901c3fbb4 /config.tests
parentd6ecdb434410ffda64058cdb51483786f5af9932 (diff)
parentea5f40a7880946dd5e3346235d1a8e1a1a8fd42e (diff)
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'config.tests')
-rw-r--r--config.tests/arch/arch.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp
index 7e481d4cf5..c4f23f7bcd 100644
--- a/config.tests/arch/arch.cpp
+++ b/config.tests/arch/arch.cpp
@@ -237,7 +237,7 @@ const char msg2[] = "==Qt=magic=Qt== Sub-architecture:"
#endif
// -- ARM --
-#ifdef __ARM_NEON__
+#if defined(__ARM_NEON) || defined(__ARM_NEON__)
" neon"
#endif
#ifdef __IWMMXT__