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/qwindowsfontdatabase.cpp | |
| 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/qwindowsfontdatabase.cpp')
| -rw-r--r-- | src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp index 9ff50bdf05..40ac46df85 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp @@ -1264,11 +1264,6 @@ QWindowsFontDatabase::~QWindowsFontDatabase() removeApplicationFonts(); } -QFontEngineMulti *QWindowsFontDatabase::fontEngineMulti(QFontEngine *fontEngine, QChar::Script script) -{ - return new QWindowsMultiFontEngine(fontEngine, script); -} - QFontEngine * QWindowsFontDatabase::fontEngine(const QFontDef &fontDef, void *handle) { const QString faceName(static_cast<const QChar*>(handle)); |