From 1c3e6b2cecebea121b08ab8ea235527a302efda3 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 5 May 2022 09:56:25 +0200 Subject: [PATCH] CMake: Don't require system freetype MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We provide a bundled version. We didn't before when the commit was initially introduced, because we thought we'd depend on a 3rd party package manager, but we didn't follow through on that. Amends 5668522413c831d6f1c607e1c87a0b1e1ee3cbc5 Pick-to: 6.2 6.3 Fixes: QTBUG-103245 Change-Id: Ia4cb1340bbf3f4ffb3849d658d72e7cb6c7e2fb0 Reviewed-by: Qt CI Bot Reviewed-by: Alexey Edelev Reviewed-by: Jörg Bornemann --- src/gui/configure.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 0474f394ab..2c009cbc41 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -36,7 +36,6 @@ if(INTEGRITY AND _qt_igy_gui_libs) MODULE_NAME gui QMAKE_LIB integrity_platform_graphics) endif() qt_find_package(WrapSystemFreetype 2.2.0 PROVIDED_TARGETS WrapSystemFreetype::WrapSystemFreetype MODULE_NAME gui QMAKE_LIB freetype) -set_package_properties(WrapFreetype PROPERTIES TYPE REQUIRED) if(QT_FEATURE_system_zlib) qt_add_qmake_lib_dependency(freetype zlib) endif()