summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-02-02 13:12:49 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-02-02 13:12:49 +0100
commit0bd46d5861fa7b48c87cd3a734d00671df929869 (patch)
treebf9a5cc0adaf211084bce0ba5c1ef914e9d0e6b4
parent908d1caf6b3ca74dc7b03229809a9b7802433e43 (diff)
parentefe32614d5fed9adaa63630bb5846271364237cb (diff)
downloadqtimageformats-0bd46d5861fa7b48c87cd3a734d00671df929869.tar.gz
Merge 5.6 into 5.6.0v5.6.0-rc1v5.6.05.6.0
Change-Id: I19a0c02f6cb3731d4b99d158106b6a1a29862dbb
-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 865f0ff..b7c1bb6 100644
--- a/src/3rdparty/libwebp.pri
+++ b/src/3rdparty/libwebp.pri
@@ -89,7 +89,7 @@ equals(QT_ARCH, arm) {
$$PWD/libwebp/src/dsp/upsampling_neon.c \
$$PWD/libwebp/src/dsp/lossless_neon.c
- contains(QT_CPU_FEATURES, neon) {
+ contains(QT_CPU_FEATURES.$$QT_ARCH, neon) {
# Default compiler settings include this feature, so just add to SOURCES
SOURCES += $$SOURCES_FOR_NEON
} else {