1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QWindowsFontDatabaseBase: Override both fontEngine functions

Browse Source 
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 <Friedemann.Kleint@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 6c832731304414932fafa10c300707192e11e751)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2022-10-24 12:43:56 +02:00 committed by Qt Cherry-pick Bot
parent e8d931b281
commit 5d1018b1a6
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/text/windows/qwindowsfontdatabasebase.cpp
View File

@ -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;

1
src/gui/text/windows/qwindowsfontdatabasebase_p.h
View File

@ -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();