diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-24 02:59:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-24 02:59:35 (GMT) |
| commit | 7f2877acd0183092c31b74ed0de8d54fb3c49caf (patch) | |
| tree | e07c83ba325b43a7ca5e73bc0fcda4847c6af48e /src/gui | |
| parent | 47727e76d44302bd870b8fc2bbae71052dcdc27a (diff) | |
| parent | 09656c9b57af5bb383d029c62396b536899b28e7 (diff) | |
| download | Qt-7f2877acd0183092c31b74ed0de8d54fb3c49caf.zip Qt-7f2877acd0183092c31b74ed0de8d54fb3c49caf.tar.gz Qt-7f2877acd0183092c31b74ed0de8d54fb3c49caf.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Doc: Fixing typo
Fixed a shadow warning when including QtSql.
Fixed a shadow warning when including QTest
Diffstat (limited to 'src/gui')
| -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) { |