Merge remote-tracking branch 'origin/dev' into wip/qt6

Change-Id: I54741635460bb2d8f3fd0be535ee1968d6c442bb

1 files changed, 15 insertions, 4 deletions

diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index 76a4662b36..085ec90c4b 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -77,7 +77,18 @@ qtConfig(png) {
 }
 
 # SIMD
-SSSE3_SOURCES += image/qimage_ssse3.cpp
-NEON_SOURCES += image/qimage_neon.cpp
-MIPS_DSPR2_SOURCES += image/qimage_mips_dspr2.cpp
-MIPS_DSPR2_ASM += image/qimage_mips_dspr2_asm.S
+!android {
+    SSSE3_SOURCES += image/qimage_ssse3.cpp
+    NEON_SOURCES += image/qimage_neon.cpp
+    MIPS_DSPR2_SOURCES += image/qimage_mips_dspr2.cpp
+    MIPS_DSPR2_ASM += image/qimage_mips_dspr2_asm.S
+} else {
+    # see https://developer.android.com/ndk/guides/abis
+    arm64-v8a {
+        SOURCES += image/qimage_neon.cpp
+    }
+    x86 | x86_64 {
+        DEFINES += QT_COMPILER_SUPPORTS_SSE2 QT_COMPILER_SUPPORTS_SSE3 QT_COMPILER_SUPPORTS_SSSE3
+        SOURCES += image/qimage_ssse3.cpp
+    }
+}