From 5a795793eb4329aadf1d90e909e835a632766476 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 7 Aug 2024 17:07:24 +0200 Subject: [PATCH] Prohibit the use of fontconfig feature on Apple platfroms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The feature is noop and is broken on Apple platforms. The obvious solution is disabling this feature there. Fixes: QTBUG-116083 Pick-to: 6.7 6.5 Change-Id: Ife4d101c70310aba8a2743d0364397b67d0a887f Reviewed-by: Tor Arne Vestbø (cherry picked from commit ccdeb2cfaf1e67cb9ba936cbe577025ed784717f) Reviewed-by: Qt Cherry-pick Bot --- src/gui/configure.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index d3773b3e15c..4a5bc443ec9 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -692,7 +692,7 @@ qt_feature("system-freetype" PRIVATE qt_feature("fontconfig" PUBLIC PRIVATE LABEL "Fontconfig" AUTODETECT NOT APPLE - CONDITION NOT WIN32 AND QT_FEATURE_system_freetype AND Fontconfig_FOUND + CONDITION NOT APPLE AND NOT WIN32 AND QT_FEATURE_system_freetype AND Fontconfig_FOUND ) qt_feature_definition("fontconfig" "QT_NO_FONTCONFIG" NEGATE VALUE "1") qt_feature("gbm"