diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-10 22:42:33 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-10 22:42:33 +0200 |
| commit | 2dcf2899b022accfef5cede1c2ea3dda2d0d6a4a (patch) | |
| tree | 774d04286a3b1ab412a2cd3a29efb09f6b227313 | |
| parent | 7824fe51318b8a87caa9ef3ed4db99914e22e6e4 (diff) | |
| parent | 95347c82df6c6ea1a61a58355fb723efd728bff3 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into tqtc/lts-5.15-opensourcev5.15.8-lts-lgpl
Change-Id: I664a1a5b2445dc02ee7251395f507051e154245e
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/3rdparty/libwebp.pri | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 6d03a03..48f4c9e 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.7 +MODULE_VERSION = 5.15.8 diff --git a/src/3rdparty/libwebp.pri b/src/3rdparty/libwebp.pri index 22f82bf..04ac21c 100644 --- a/src/3rdparty/libwebp.pri +++ b/src/3rdparty/libwebp.pri @@ -138,7 +138,7 @@ SOURCES_FOR_NEON += \ android { arm64-v8a | armeabi-v7a: SOURCES += $$SOURCES_FOR_NEON -} else: equals(QT_ARCH, arm)|equals(QT_ARCH, arm64) { +} else:!macos: 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 @@ -156,4 +156,7 @@ android { silent: neon_comp.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_comp.commands QMAKE_EXTRA_COMPILERS += neon_comp } +} else:macos { + CONFIG += simd + NEON_SOURCES += $$SOURCES_FOR_NEON } |