diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-03 08:54:51 +0200 |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-03 08:54:51 +0200 |
| commit | e7935dc46fcc062b28cc3aa385f389fa3842b190 (patch) | |
| tree | 1559e188c8a4f3f149d5880e52f31ee996f4be2b /src/gui/text/qfontengine.cpp | |
| parent | 54796e0d3150df7dd94e715c095c21fb227139ee (diff) | |
| parent | fc4d386f2cc8984b98957d83d8cdb57c1105890f (diff) | |
Merge commit 'staging-1/4.7' into doc-4.7
Diffstat (limited to 'src/gui/text/qfontengine.cpp')
| -rw-r--r-- | src/gui/text/qfontengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 2c23cbd693..569853ca83 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -874,8 +874,8 @@ const uchar *QFontEngine::getCMap(const uchar *table, uint tableSize, bool *isSy enum { Invalid, - Symbol, AppleRoman, + Symbol, Unicode11, Unicode, MicrosoftUnicode, @@ -939,7 +939,7 @@ const uchar *QFontEngine::getCMap(const uchar *table, uint tableSize, bool *isSy return 0; resolveTable: - *isSymbolFont = (score == Symbol); + *isSymbolFont = (symbolTable > -1); unsigned int unicode_table = qFromBigEndian<quint32>(maps + 8*tableToUse + 4); |