diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-29 21:26:22 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-29 21:26:22 +0200 |
| commit | bd9f1292e4aaab82de3aa0926657bcda2c3923a4 (patch) | |
| tree | 95ea27b0ac3e7a38812ca71b3ff307863408db80 /src | |
| parent | 80d2bdc2360be17e4ef5186f6015f10b7b32fa91 (diff) | |
| parent | 17b503073d5aeb505c15ef94f5af10d76898b1cf (diff) | |
Merge remote-tracking branch 'origin/5.14' into dev
Change-Id: Ie8ed91a581296c126ce0132e8860289e4b673000
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/libwebp.pri | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/3rdparty/libwebp.pri b/src/3rdparty/libwebp.pri index 3e839a2..6f49549 100644 --- a/src/3rdparty/libwebp.pri +++ b/src/3rdparty/libwebp.pri @@ -123,18 +123,21 @@ integrity { QMAKE_CFLAGS += -c99 } -equals(QT_ARCH, arm)|equals(QT_ARCH, arm64) { - SOURCES_FOR_NEON += \ - $$PWD/libwebp/src/dsp/alpha_processing_neon.c \ - $$PWD/libwebp/src/dsp/dec_neon.c \ - $$PWD/libwebp/src/dsp/enc_neon.c \ - $$PWD/libwebp/src/dsp/filters_neon.c \ - $$PWD/libwebp/src/dsp/lossless_enc_neon.c \ - $$PWD/libwebp/src/dsp/lossless_neon.c \ - $$PWD/libwebp/src/dsp/rescaler_neon.c \ - $$PWD/libwebp/src/dsp/upsampling_neon.c \ - $$PWD/libwebp/src/dsp/yuv_neon.c +SOURCES_FOR_NEON += \ + $$PWD/libwebp/src/dsp/alpha_processing_neon.c \ + $$PWD/libwebp/src/dsp/dec_neon.c \ + $$PWD/libwebp/src/dsp/enc_neon.c \ + $$PWD/libwebp/src/dsp/filters_neon.c \ + $$PWD/libwebp/src/dsp/lossless_enc_neon.c \ + $$PWD/libwebp/src/dsp/lossless_neon.c \ + $$PWD/libwebp/src/dsp/rescaler_neon.c \ + $$PWD/libwebp/src/dsp/upsampling_neon.c \ + $$PWD/libwebp/src/dsp/yuv_neon.c + +android { + arm64-v8a|equals(QT_ARCH, arm64): 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 SOURCES += $$SOURCES_FOR_NEON |