diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-18 03:00:15 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-18 03:00:15 +0100 |
| commit | 81c341d1f804f54a1a734db4ac4a6bd69ad914d9 (patch) | |
| tree | 02069e26f4d8b482f944873239da5aec5c305e2a | |
| parent | b62656e99c0f6c7d8762718de90ae6d24be11662 (diff) | |
| parent | d89c6be6f28182111cabe9547d10e31d8a7cd05f (diff) | |
| download | qtimageformats-81c341d1f804f54a1a734db4ac4a6bd69ad914d9.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I1f1ad47eeff286303de844d8cc06ed8d69c4b3b3
| -rw-r--r-- | src/3rdparty/libwebp.pri | 2 |
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 |