Use DirectWrite font engine for non-ttf fonts as well

DirectWrite supports different font types, not just TTF. In order
to enable e.g. CFF support, we simply remove the test for TTF
which was initially put in to be on the safe side when handling
bitmap fonts. However, using DirectWrite with bitmap fonts also
seems to work fine, so there's no reason to have the fallback.

Task-number: QTBUG-22654
Change-Id: I8572bc421ab3dd223025ea152ba9b33f7cf33a8a
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>

diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
index 25f6c4a..1f3c51c 100644 (file)
--- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
@@ -1758,9 +1758,7 @@ QFontEngine *QWindowsFontDatabase::createEngine(int script, const QFontDef &requ
         ttf = tm.tmPitchAndFamily & TMPF_TRUETYPE;
         SelectObject(hdc, oldObj);
 
-        if (!ttf || !useDirectWrite) {
-            useDirectWrite = false;
-
+        if (!useDirectWrite) {
             if (hfont && (!ttf || request.stretch != 100)) {
                 DeleteObject(hfont);
                 if (!res)