diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2010-09-02 13:57:59 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2010-09-02 15:12:53 (GMT) |
| commit | 19beb3de012c4531dc69699bbb33f2cf1e86a84c (patch) | |
| tree | 1c4c970bd35258e5cf84f7708c02c2f14d8a2f99 /src | |
| parent | 594d76ed6f2fb9febee1802a4bd67e48e935d361 (diff) | |
| download | Qt-19beb3de012c4531dc69699bbb33f2cf1e86a84c.zip Qt-19beb3de012c4531dc69699bbb33f2cf1e86a84c.tar.gz Qt-19beb3de012c4531dc69699bbb33f2cf1e86a84c.tar.bz2 | |
Fix broken S60 build
Reviewed-by: Liang Qi
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qfontengine_s60.cpp | 7 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_s60_p.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/text/qfontengine_s60.cpp index 2c533db..5980f20 100644 --- a/src/gui/text/qfontengine_s60.cpp +++ b/src/gui/text/qfontengine_s60.cpp @@ -166,6 +166,11 @@ const uchar *QSymbianTypeFaceExtras::cmap() const return reinterpret_cast<const uchar *>(m_cmapTable.constData()); } +bool QSymbianTypeFaceExtras::isSymbolCMap() const +{ + return m_symbolCMap; +} + CFont *QSymbianTypeFaceExtras::fontOwner() const { return m_cFont; @@ -256,7 +261,7 @@ bool QFontEngineS60::stringToCMap(const QChar *characters, int len, QGlyphLayout for (int i = 0; i < len; ++i) { const unsigned int uc = getChar(characters, i, len); *g++ = QFontEngine::getTrueTypeGlyphIndex(cmap, - (isRtl && !m_symbolCMap) ? QChar::mirroredChar(uc) : uc); + (isRtl && !m_extras->isSymbolCMap()) ? QChar::mirroredChar(uc) : uc); } glyphs->numGlyphs = g - glyphs->glyphs; diff --git a/src/gui/text/qfontengine_s60_p.h b/src/gui/text/qfontengine_s60_p.h index d65f13b..d05c23c 100644 --- a/src/gui/text/qfontengine_s60_p.h +++ b/src/gui/text/qfontengine_s60_p.h @@ -81,6 +81,7 @@ public: bool getSfntTableData(uint tag, uchar *buffer, uint *length) const; const uchar *cmap() const; CFont *fontOwner() const; + bool isSymbolCMap() const; private: CFont* m_cFont; |