summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/painting.pri
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-11-12 15:50:00 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-11-26 15:40:41 +0000
commit07fdfa559844403d0836ab0783f201b50a9961af (patch)
tree13c74b582d73884a44826d8d070e5b8ae2d3d81d /src/gui/painting/painting.pri
parent5c446031c3d570d9126e50b658199ca2a1e37eba (diff)
Detect NEON on AArch64
The __ARM_NEON is the standard define for NEON instructions support __ARM_NEON__ is only legacy, and specifically not defined in AArch64 builds, which causes us not to detect NEON support there. The NEON assembler files doesn't build with AArch64, so the NEON drawhelper methods must be excluded for now. Change-Id: Ie32f855bde94ee7efd8a8ddb7766c931778e729b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/painting/painting.pri')
-rw-r--r--src/gui/painting/painting.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index 2e2532a25f..fd9ae0aaca 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -101,7 +101,7 @@ SSE4_1_SOURCES += painting/qdrawhelper_sse4.cpp \
painting/qimagescale_sse4.cpp
AVX2_SOURCES += painting/qdrawhelper_avx2.cpp
-!ios {
+!ios:!contains(QT_ARCH, "arm64") {
CONFIG += no_clang_integrated_as
NEON_SOURCES += painting/qdrawhelper_neon.cpp
NEON_HEADERS += painting/qdrawhelper_neon_p.h