diff options
| author | Guoqing Zhang <guoqing.zhang@nokia.com> | 2011-04-11 06:18:57 (GMT) |
|---|---|---|
| committer | Guoqing Zhang <guoqing.zhang@nokia.com> | 2011-04-11 06:18:57 (GMT) |
| commit | 65d255c80d0e029bc94b320fa315095b957098a0 (patch) | |
| tree | d9b5bdb1474f22507e46f5525777ffc43277f081 /src/gui/text/qfontengine_p.h | |
| parent | fe4e8d469938f2c337e186c03930d543677c3ee2 (diff) | |
| parent | 082b9125d627df11692f2a03b80c9e962e82eda5 (diff) | |
| download | Qt-65d255c80d0e029bc94b320fa315095b957098a0.zip Qt-65d255c80d0e029bc94b320fa315095b957098a0.tar.gz Qt-65d255c80d0e029bc94b320fa315095b957098a0.tar.bz2 | |
Merge remote branch 'qt-master/master'
Conflicts:
src/s60installs/qt.iby
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 f501141..7b29993 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -203,7 +203,7 @@ public: virtual QImage alphaMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t); virtual QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, int margin, const QTransform &t); - virtual glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, const QTransform &matrix, GlyphFormat /*format*/) + virtual glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed /*subPixelPosition*/, const QTransform &matrix, GlyphFormat /*format*/) { return boundingBox(glyph, matrix); } |