diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-08 09:34:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-08 09:34:24 +0100 |
| commit | 0e96b5fe482802935ae202e2297404845e440d71 (patch) | |
| tree | 79c566f18bc605261f69d750d2935b91edba3861 /src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h | |
| parent | da43362921a62ea3163a042be20ec0f550d05cfa (diff) | |
| parent | 5733dfbd90fd059e7310786faefb022b00289592 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.12.1
Conflicts:
src/widgets/kernel/qtooltip.cpp
Change-Id: Ic2f9a425359050eb56b3a4e5162cf5e3447058c8
Diffstat (limited to 'src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h')
| -rw-r--r-- | src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h index a151cf7343..2b575a9b45 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h @@ -67,8 +67,6 @@ class QWindowsFontEngineData; class QWindowsFontEngine : public QFontEngine { Q_DISABLE_COPY(QWindowsFontEngine) - friend class QWindowsMultiFontEngine; - public: QWindowsFontEngine(const QString &name, LOGFONT lf, const QSharedPointer<QWindowsFontEngineData> &fontEngineData); @@ -169,14 +167,6 @@ private: mutable int designAdvancesSize = 0; }; -class QWindowsMultiFontEngine : public QFontEngineMulti -{ -public: - explicit QWindowsMultiFontEngine(QFontEngine *fe, int script); - - QFontEngine *loadEngine(int at) override; -}; - QT_END_NAMESPACE Q_DECLARE_METATYPE(HFONT) |