diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-24 00:56:59 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-24 00:56:59 +0100 |
| commit | f0fbff4c905fd3e21d7aefedd45d98cc9dd54018 (patch) | |
| tree | c61f47f858a9ac6183676bd7aee378a6a2b84a19 /src/plugins/platforms/windows/qwindowsfontdatabase.cpp | |
| parent | d776937df91e46536f404c6868d64016b6038d7b (diff) | |
| parent | 0e1ce36ae67de940b2d499ec7f23e520dce0f112 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2defae1904154283446b069d151c3ef57302ec7b
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsfontdatabase.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp index e19e8d350f..2b6a6255b8 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; } |