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. Pick-to: 6.4 6.2 Change-Id: Ie5684b60a13d71966b9741fcfcdacbd37fe0df85 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>bb10
parent
4c7524cbe8
commit
6c83273130
|
|
@ -751,6 +751,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;
|
||||
|
|
|
|||
|
|
@ -53,6 +53,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();
|
||||
|
|
|
|||
Loading…
Reference in New Issue