diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_config.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/libwebp.pri | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index fec66b7..b1c22d3 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.8.1 +MODULE_VERSION = 5.9.0 diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h index a6bf38c..b0618df 100644 --- a/src/3rdparty/libtiff/libtiff/tif_config.h +++ b/src/3rdparty/libtiff/libtiff/tif_config.h @@ -139,7 +139,7 @@ /* #undef HAVE_PTHREAD */ /* Define to 1 if you have the <search.h> header file. */ -#if !defined(Q_OS_WINCE) && !defined(Q_OS_VXWORKS) && !defined(Q_OS_ANDROID) +#if !defined(Q_OS_WINCE) && !defined(Q_OS_VXWORKS) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY) #define HAVE_SEARCH_H 1 #endif diff --git a/src/3rdparty/libwebp.pri b/src/3rdparty/libwebp.pri index 75ada7d..1fc719b 100644 --- a/src/3rdparty/libwebp.pri +++ b/src/3rdparty/libwebp.pri @@ -115,6 +115,10 @@ android { INCLUDEPATH += $$NDK_ROOT/sources/android/cpufeatures } +integrity { + QMAKE_CFLAGS += -c99 +} + equals(QT_ARCH, arm)|equals(QT_ARCH, arm64) { SOURCES_FOR_NEON += \ $$PWD/libwebp/src/dsp/dec_neon.c \ |