From caef33ae2df64eb397eadfc4ce4735545ff93ea5 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 30 Jan 2020 15:23:58 +0100 Subject: Fix NEON support on Android armeabi-v7a Task-number: QTBUG-81461 Change-Id: Ic3e8367aee990291fc676204b9299530953fc87a Reviewed-by: BogDan Vatra --- src/gui/image/image.pri | 2 +- src/gui/painting/painting.pri | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index 1f42f28d1e..01e48c17dd 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -97,7 +97,7 @@ qtConfig(png) { MIPS_DSPR2_ASM += image/qimage_mips_dspr2_asm.S } else { # see https://developer.android.com/ndk/guides/abis - arm64-v8a { + arm64-v8a | armeabi-v7a { SOURCES += image/qimage_neon.cpp } x86 | x86_64 { diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index fcf6488edd..c68e8d6e9a 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -166,7 +166,7 @@ gcc:equals(QT_GCC_MAJOR_VERSION, 5) { DEFINES += QT_COMPILER_SUPPORTS_SSE4_1 QT_COMPILER_SUPPORTS_SSE4_2 SOURCES += painting/qdrawhelper_sse4.cpp painting/qimagescale_sse4.cpp } - arm64-v8a { + arm64-v8a | armeabi-v7a { SOURCES += painting/qdrawhelper_neon.cpp painting/qimagescale_neon.cpp HEADERS += painting/qdrawhelper_neon_p.h } -- cgit v1.2.3