diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-11-29 06:39:31 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-11-29 06:39:31 (GMT) |
| commit | 4592fc2e481b42bbbe1f59e575ce3c9b9af9c9e4 (patch) | |
| tree | 9adb0250ed390477e37741de97bede2bae148f7e /src/gui/text | |
| parent | f7d66442963e1380a4f2db3d24cb24aa9d5c63ad (diff) | |
| parent | bf5571b485420a945e9fdf3bf5b31cfe4c4d482b (diff) | |
| download | Qt-4592fc2e481b42bbbe1f59e575ce3c9b9af9c9e4.zip Qt-4592fc2e481b42bbbe1f59e575ce3c9b9af9c9e4.tar.gz Qt-4592fc2e481b42bbbe1f59e575ce3c9b9af9c9e4.tar.bz2 | |
Merge remote branch 'origin/master' into lighthouse-master
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontengine_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/text/qfontengine_x11.cpp index aee21f6..af2ce98 100644 --- a/src/gui/text/qfontengine_x11.cpp +++ b/src/gui/text/qfontengine_x11.cpp @@ -429,7 +429,7 @@ void QFontEngineXLFD::recalcAdvances(QGlyphLayout *glyphs, QTextEngine::ShaperFl { int i = glyphs->numGlyphs; XCharStruct *xcs; - // inlined for better perfomance + // inlined for better performance if (!_fs->per_char) { xcs = &_fs->min_bounds; while (i != 0) { |