AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove zlib from bootstrap library

Browse Source 
None of the bootstrapped tools use zlib anymore.

Change-Id: I2cd7cb855ed671916a21c23449d9b6c4506f8546
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Joerg Bornemann 2021-10-13 10:06:54 +02:00
parent 896f71d500
commit 879f86098e
4 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qconfig-bootstrapped.h
View File

@ -136,6 +136,8 @@
#define QT_NO_TRANSLATION
#define QT_FEATURE_translation -1
#define QT_NO_COMPRESS
// rcc.pro will DEFINES+= this
#ifndef QT_FEATURE_zstd
#define QT_FEATURE_zstd -1

26
src/tools/bootstrap/CMakeLists.txt
View File

@ -243,32 +243,6 @@ qt_internal_extend_target(Bootstrap CONDITION QT_FEATURE_system_pcre2 AND NOT CM
WrapPCRE2::WrapPCRE2
)
qt_internal_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib
SOURCES
../../3rdparty/zlib/src/adler32.c
../../3rdparty/zlib/src/compress.c
../../3rdparty/zlib/src/crc32.c
../../3rdparty/zlib/src/deflate.c
../../3rdparty/zlib/src/gzclose.c
../../3rdparty/zlib/src/gzlib.c
../../3rdparty/zlib/src/gzread.c
../../3rdparty/zlib/src/gzwrite.c
../../3rdparty/zlib/src/infback.c
../../3rdparty/zlib/src/inffast.c
../../3rdparty/zlib/src/inflate.c
../../3rdparty/zlib/src/inftrees.c
../../3rdparty/zlib/src/trees.c
../../3rdparty/zlib/src/uncompr.c
../../3rdparty/zlib/src/zutil.c
INCLUDE_DIRECTORIES
../../3rdparty/zlib/src
)
qt_internal_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING
LIBRARIES
WrapZLIB::WrapZLIB
)
qt_internal_extend_target(Bootstrap CONDITION MINGW AND WIN32
PUBLIC_LIBRARIES
uuid

1
src/tools/cmake_automoc_parser/CMakeLists.txt
View File

@ -13,7 +13,6 @@ qt_internal_add_tool(${target_name}
QT_MOC
QT_NO_CAST_FROM_ASCII
QT_NO_CAST_FROM_BYTEARRAY
QT_NO_COMPRESS
QT_NO_FOREACH
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}

1
src/tools/moc/CMakeLists.txt
View File

@ -27,7 +27,6 @@ qt_internal_add_tool(${target_name}
QT_MOC
QT_NO_CAST_FROM_ASCII
QT_NO_CAST_FROM_BYTEARRAY
QT_NO_COMPRESS
QT_NO_FOREACH
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}