DirectWrite font db: Fix writing system detection

The implementation here was accidentally missing from the
first commit. We use the OS/2 table for determining the writing system
support as intended by the font designer, and fall back to actually
checking the Unicode ranges if the table should be missing.

Change-Id: Ibfdf76c27f3a94eda2142b3e269a1ca30d4bc045
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 1 insertions, 11 deletions

diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 894919a1c8..bc55efd23d 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -268,17 +268,7 @@ static void getFontDescription(CTFontDescriptorRef font, FontDescription *fd)
                     Q_UNREACHABLE();
                 Q_ASSERT(length >= 86);
             }
-            quint32 unicodeRange[4] = {
-                qFromBigEndian<quint32>(os2Table.data() + 42),
-                qFromBigEndian<quint32>(os2Table.data() + 46),
-                qFromBigEndian<quint32>(os2Table.data() + 50),
-                qFromBigEndian<quint32>(os2Table.data() + 54)
-            };
-            quint32 codePageRange[2] = {
-                qFromBigEndian<quint32>(os2Table.data() + 78),
-                qFromBigEndian<quint32>(os2Table.data() + 82)
-            };
-            fd->writingSystems = QPlatformFontDatabase::writingSystemsFromTrueTypeBits(unicodeRange, codePageRange);
+            fd->writingSystems = QPlatformFontDatabase::writingSystemsFromOS2Table(reinterpret_cast<const char *>(os2Table.data()), length);
         }
     }