diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 18:35:57 +0200 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 18:35:57 +0200 |
commit | 50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (patch) | |
tree | 7517568b333bcc5679e7a165c48aaa7bd06a66fb /src/gui/text/qfontengine_p.h | |
parent | 61f013168e5ef5111948a1ae0a1464753986adb2 (diff) | |
parent | ce40a078caa4a09793128ca730cc5ca268aeee87 (diff) |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
-rw-r--r-- | src/gui/text/qfontengine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index d1ec4c1c39..cd3b488d93 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -167,7 +167,7 @@ public: virtual QFixed emSquareSize() const { return ascent(); } - /* returns 0 as glyph index for non existant glyphs */ + /* returns 0 as glyph index for non existent glyphs */ virtual bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, QTextEngine::ShaperFlags flags) const = 0; /** |