summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-15 03:02:49 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-15 03:02:49 +0100
commitd89c6be6f28182111cabe9547d10e31d8a7cd05f (patch)
tree6bc85afae6a61ae1100c0a2aa7e9e9bf41c287e7
parentf422f52fcd7d0d5418d91b24508c3d5338cfd61a (diff)
parent9584748fc6847240fd6b748e6735e91e451b8958 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.155.15
-rw-r--r--src/3rdparty/libwebp.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/libwebp.pri b/src/3rdparty/libwebp.pri
index 6f49549..c193ddf 100644
--- a/src/3rdparty/libwebp.pri
+++ b/src/3rdparty/libwebp.pri
@@ -136,7 +136,7 @@ SOURCES_FOR_NEON += \
android {
- arm64-v8a|equals(QT_ARCH, arm64): SOURCES += $$SOURCES_FOR_NEON
+ arm64-v8a | armeabi-v7a: SOURCES += $$SOURCES_FOR_NEON
} else: equals(QT_ARCH, arm)|equals(QT_ARCH, arm64) {
contains(QT_CPU_FEATURES.$$QT_ARCH, neon) {
# Default compiler settings include this feature, so just add to SOURCES