From 5d1018b1a600c44b76aeb4476f173628ac19c0e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Mon, 24 Oct 2022 12:43:56 +0200 Subject: [PATCH] QWindowsFontDatabaseBase: Override both fontEngine functions MinGW-clang gives warning(-as-error) because the overridden function which is there shadows the other overload, making it inaccessible. Change-Id: Ie5684b60a13d71966b9741fcfcdacbd37fe0df85 Reviewed-by: Friedemann Kleint Reviewed-by: Oliver Wolff (cherry picked from commit 6c832731304414932fafa10c300707192e11e751) Reviewed-by: Qt Cherry-pick Bot --- src/gui/text/windows/qwindowsfontdatabasebase.cpp | 7 +++++++ src/gui/text/windows/qwindowsfontdatabasebase_p.h | 1 + 2 files changed, 8 insertions(+) diff --git a/src/gui/text/windows/qwindowsfontdatabasebase.cpp b/src/gui/text/windows/qwindowsfontdatabasebase.cpp index 9409b62c9c0..458d3e96feb 100644 --- a/src/gui/text/windows/qwindowsfontdatabasebase.cpp +++ b/src/gui/text/windows/qwindowsfontdatabasebase.cpp @@ -789,6 +789,13 @@ IDWriteFontFace *QWindowsFontDatabaseBase::createDirectWriteFace(const QByteArra } #endif // directwrite && direct2d +QFontEngine *QWindowsFontDatabaseBase::fontEngine(const QFontDef &fontDef, void *handle) +{ + // This function was apparently not used before, and probably isn't now either, + // call the base implementation which just prints that it's not supported. + return QPlatformFontDatabase::fontEngine(fontDef, handle); +} + QFontEngine *QWindowsFontDatabaseBase::fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) { QFontEngine *fontEngine = nullptr; diff --git a/src/gui/text/windows/qwindowsfontdatabasebase_p.h b/src/gui/text/windows/qwindowsfontdatabasebase_p.h index 8739dce00d4..7f07027ebc6 100644 --- a/src/gui/text/windows/qwindowsfontdatabasebase_p.h +++ b/src/gui/text/windows/qwindowsfontdatabasebase_p.h @@ -89,6 +89,7 @@ public: QWindowsFontDatabaseBase(); ~QWindowsFontDatabaseBase() override; + QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override; QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) override; static int defaultVerticalDPI();