diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-02-16 13:00:53 +0400 |
---|---|---|
committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-20 13:44:14 +0000 |
commit | 4d54fe8d02d57090d772f50dfc1567783d320b5c (patch) | |
tree | 40242be84d4bfa20424761e4e0efaa2eaaf786ff /src/plugins/platforms/windows/qwindowsfontdatabase.cpp | |
parent | af1a99ebb9a8f2415106ab6bfe85fcd77412e740 (diff) |
Simplify QWindowsFontDatabase::createEngine()
Reduce code duplication and improve readability.
Change-Id: Idf53c80077daa9bac03a72acfd2b6c7e3a24ad97
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsfontdatabase.cpp')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp index 97a319b63a..5a812c32f4 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp @@ -1735,13 +1735,7 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request, QFontEngine *fe = 0; if (!useDirectWrite) { - HFONT hfont = CreateFontIndirect(&lf); - if (!hfont) { - qErrnoWarning("%s: CreateFontIndirect failed", __FUNCTION__); - hfont = QWindowsFontDatabase::systemFont(); - } - - QWindowsFontEngine *few = new QWindowsFontEngine(request.family, hfont, lf, data); + QWindowsFontEngine *few = new QWindowsFontEngine(request.family, lf, data); if (preferClearTypeAA) few->glyphFormat = QFontEngine::Format_A32; few->initFontInfo(request, dpi); |