diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-12-17 09:49:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-19 05:49:20 +0100 |
| commit | 4b2c73b4767bcb512cbc17f65186eac5d004db07 (patch) | |
| tree | 9b68e2cb817a0054cefc6475c40b7875f5ef80c6 /src/plugins | |
| parent | dbf3c559daba62d9411eb31a3204487397d41d44 (diff) | |
Fix writingSystems determination by code page range bits
Do exactly what windows font database does to determine
writingSystems in case of non-truetype fonts.
Task-number: QTBUG-13585
Change-Id: I4a1a48d74c36e403c31f20847cf80295d89a34bc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp index c2c8c15a30..3a6f9f72e3 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp @@ -627,7 +627,6 @@ static inline QFontDatabase::WritingSystem writingSystemFromCharSet(uchar charSe case EASTEUROPE_CHARSET: case BALTIC_CHARSET: case TURKISH_CHARSET: - case OEM_CHARSET: return QFontDatabase::Latin; case GREEK_CHARSET: return QFontDatabase::Greek; @@ -652,8 +651,6 @@ static inline QFontDatabase::WritingSystem writingSystemFromCharSet(uchar charSe return QFontDatabase::Vietnamese; case SYMBOL_CHARSET: return QFontDatabase::Symbol; - // ### case MAC_CHARSET: - // ### case DEFAULT_CHARSET: default: break; } diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp index 8d14adf828..51f79736f2 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp +++ b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp @@ -81,7 +81,6 @@ static inline QFontDatabase::WritingSystem writingSystemFromCharSet(uchar charSe case EASTEUROPE_CHARSET: case BALTIC_CHARSET: case TURKISH_CHARSET: - case OEM_CHARSET: return QFontDatabase::Latin; case GREEK_CHARSET: return QFontDatabase::Greek; @@ -106,8 +105,6 @@ static inline QFontDatabase::WritingSystem writingSystemFromCharSet(uchar charSe return QFontDatabase::Vietnamese; case SYMBOL_CHARSET: return QFontDatabase::Symbol; - // ### case MAC_CHARSET: - // ### case DEFAULT_CHARSET: default: break; } |