diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2022-10-24 12:43:56 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2022-10-26 12:30:09 +0200 |
| commit | 6c832731304414932fafa10c300707192e11e751 (patch) | |
| tree | f52dccf72d1886ca6590f3072fd2e48c077bb4d7 /src/gui/text/windows/qwindowsfontdatabasebase_p.h | |
| parent | 4c7524cbe8f7d53faeda8d4ecb65ee050f209e8b (diff) | |
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>
Diffstat (limited to 'src/gui/text/windows/qwindowsfontdatabasebase_p.h')
| -rw-r--r-- | src/gui/text/windows/qwindowsfontdatabasebase_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/windows/qwindowsfontdatabasebase_p.h b/src/gui/text/windows/qwindowsfontdatabasebase_p.h index d192c62d7f..1451eed051 100644 --- a/src/gui/text/windows/qwindowsfontdatabasebase_p.h +++ b/src/gui/text/windows/qwindowsfontdatabasebase_p.h @@ -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(); |