From 42ef047d552ff867965cc7e8d548fb4dee59d17d Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Thu, 11 Apr 2024 11:23:51 +1000 Subject: [PATCH] Temporarily disable google font downloads This isn't available since Google removed the static downloads, we'll need another approach to handle this Refs https://github.com/google/fonts/issues/7481 Refs https://github.com/qgis/QGIS/issues/57070 --- src/core/textrenderer/qgsfontmanager.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/core/textrenderer/qgsfontmanager.cpp b/src/core/textrenderer/qgsfontmanager.cpp index fe112b400a06..b06ec9fe4775 100644 --- a/src/core/textrenderer/qgsfontmanager.cpp +++ b/src/core/textrenderer/qgsfontmanager.cpp @@ -1795,6 +1795,8 @@ QString QgsFontManager::urlForFontDownload( const QString &family, QString &matc QStringLiteral( "Zilla Slab Highlight" ), }; +// temporarily unavailable -- see https://github.com/google/fonts/issues/7481 +#if 0 auto cleanFontFamily = []( const QString & family ) -> QString { const thread_local QRegularExpression charsToRemove( QStringLiteral( "[^a-z]" ) ); @@ -1807,6 +1809,7 @@ QString QgsFontManager::urlForFontDownload( const QString &family, QString &matc matchedFamily.clear(); const QString cleanedFamily = cleanFontFamily( family ); + for ( const QString &candidate : sGoogleFonts ) { if ( cleanFontFamily( candidate ) == cleanedFamily ) @@ -1817,6 +1820,11 @@ QString QgsFontManager::urlForFontDownload( const QString &family, QString &matc return QStringLiteral( "https://fonts.google.com/download?family=%1" ).arg( paramName ); } } +#else + ( void )family; + matchedFamily.clear(); +#endif + return QString(); }