From c8b9fcef6c69ed4636ecebfbfad3f0fcfad659d7 Mon Sep 17 00:00:00 2001 From: Aleksandr Reviakin Date: Thu, 15 Sep 2022 13:59:05 +0200 Subject: [PATCH] wasm: add DejaVu Sans as a fallback font MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add fallback font which supports emoji. Similar logic of addding additional fallback fonts is used for some other platforms. Fixes: QTBUG-87339 Change-Id: Iad9e7071bcc3c5bb1c11c6c745fd86f7d0f7860b Reviewed-by: Mikołaj Boc Reviewed-by: Tor Arne Vestbø Reviewed-by: Eskil Abrahamsen Blomfeldt (cherry picked from commit 81d9b5ada4d6e495a592123cf76ac5fff0718014) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/wasm/qwasmfontdatabase.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/platforms/wasm/qwasmfontdatabase.cpp b/src/plugins/platforms/wasm/qwasmfontdatabase.cpp index 7f90986121f..b9228010334 100644 --- a/src/plugins/platforms/wasm/qwasmfontdatabase.cpp +++ b/src/plugins/platforms/wasm/qwasmfontdatabase.cpp @@ -41,11 +41,13 @@ QStringList QWasmFontDatabase::fallbacksForFamily(const QString &family, QFont:: QStringList fallbacks = QFreeTypeFontDatabase::fallbacksForFamily(family, style, styleHint, script); - // Add the vera.ttf font (loaded in populateFontDatabase above) as a falback font + // Add the vera.ttf and DejaVuSans.ttf fonts (loaded in populateFontDatabase above) as falback fonts // to all other fonts (except itself). - const QString veraFontFamily = QStringLiteral("Bitstream Vera Sans"); - if (family != veraFontFamily) - fallbacks.append(veraFontFamily); + static const QString wasmFallbackFonts[] = { "Bitstream Vera Sans", "DejaVu Sans" }; + for (auto wasmFallbackFont : wasmFallbackFonts) { + if (family != wasmFallbackFont && !fallbacks.contains(wasmFallbackFont)) + fallbacks.append(wasmFallbackFont); + } return fallbacks; }