Decrease code duplication in QFontDatabase-s

Move scriptRequiresOpenType() body right into QFontEngine::supportsScript(),
thus centralizing use of this performance cheat.

Change-Id: I5f494b086f8f900b631c491f41e9cb800002c0f6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 4 insertions, 15 deletions

diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
index 22be4418a9..60711d36f6 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
@@ -1407,12 +1407,6 @@ HFONT QWindowsFontDatabase::systemFont()
 
 // Creation functions
 
-static inline bool scriptRequiresOpenType(int script)
-{
-    return ((script >= QChar::Script_Syriac && script <= QChar::Script_Sinhala)
-            || script == QChar::Script_Khmer || script == QChar::Script_Nko);
-}
-
 static const char *other_tryFonts[] = {
     "Arial",
     "MS UI Gothic",
@@ -1763,15 +1757,10 @@ QFontEngine *QWindowsFontDatabase::createEngine(int script, const QFontDef &requ
             few->glyphFormat = QFontEngineGlyphCache::Raster_RGBMask;
 
         // Also check for OpenType tables when using complex scripts
-        // ### TODO: This only works for scripts that require OpenType. More generally
-        // for scripts that do not require OpenType we should just look at the list of
-        // supported writing systems in the font's OS/2 table.
-        if (scriptRequiresOpenType(script)) {
-            if (!few->supportsScript(QChar::Script(script))) {
-                qWarning("  OpenType support missing for script\n");
-                delete few;
-                return 0;
-            }
+        if (!few->supportsScript(QChar::Script(script))) {
+            qWarning("  OpenType support missing for script\n");
+            delete few;
+            return 0;
         }
 
         few->initFontInfo(request, fontHdc, dpi);