From a2329274749af6b0cdf090e58064c4e2655cabdb Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 23 Feb 2022 14:24:09 +0100 Subject: [PATCH] Add back accidentally removed check for QT_FEATURE_system_zlib This commit amends be2745e4788cecb0d3122081e3328e4b66923609 Pick-to: 6.3 Change-Id: I2fd687e12440cc40ad25b65cbfcc1ce261d04258 Reviewed-by: Alexandru Croitor --- src/corelib/CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index bb0148ae31..05ac6866d9 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -1326,11 +1326,13 @@ qt_internal_add_docs(Core doc/qtcore.qdocconf ) -qt_internal_add_3rdparty_header_module(ZlibPrivate - EXTERNAL_HEADERS - ../3rdparty/zlib/src/zlib.h - ../3rdparty/zlib/src/zconf.h -) +if(NOT QT_FEATURE_system_zlib) + qt_internal_add_3rdparty_header_module(ZlibPrivate + EXTERNAL_HEADERS + ../3rdparty/zlib/src/zlib.h + ../3rdparty/zlib/src/zconf.h + ) +endif() qt_internal_add_optimize_full_flags()