diff -r cc75c76972ee -r c0432d11811c src/gui/text/qtextengine.cpp --- a/src/gui/text/qtextengine.cpp Wed Apr 21 12:15:23 2010 +0300 +++ b/src/gui/text/qtextengine.cpp Wed Apr 21 20:15:53 2010 +0300 @@ -856,7 +856,7 @@ } } -extern int qt_defaultDpiY(); // in qfont.cpp +Q_GUI_EXPORT extern int qt_defaultDpiY(); // in qfont.cpp void QTextEngine::shapeText(int item) const { @@ -1648,7 +1648,7 @@ } } - glyph_t glyph = glyphs.glyphs[logClusters[pos + ilen - 1]]; + glyph_t glyph = glyphs.glyphs[logClusters[ilen - 1]]; glyph_metrics_t gi = fe->boundingBox(glyph); if (gi.isValid()) gm.width -= qRound(gi.xoff - gi.x - gi.width); @@ -2495,7 +2495,7 @@ // qDebug("split at position %d itempos=%d", pos, item); } -extern int qt_defaultDpiY(); +Q_GUI_EXPORT extern int qt_defaultDpiY(); QFixed QTextEngine::calculateTabWidth(int item, QFixed x) const {