diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-10 23:02:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-10 23:02:48 (GMT) |
| commit | 2e5a459cc5e3a302274db69172603ed8fb346420 (patch) | |
| tree | a5bf635c50b3d14f8ed29fc1f71013e0e307f658 /src/gui/text/qfontengine.cpp | |
| parent | 31cc0b1820c0c8fdfdbc3d5b804f2dba2051c96f (diff) | |
| parent | 408ff8b676e22a33c962077467d1f48b58286d43 (diff) | |
| download | Qt-2e5a459cc5e3a302274db69172603ed8fb346420.zip Qt-2e5a459cc5e3a302274db69172603ed8fb346420.tar.gz Qt-2e5a459cc5e3a302274db69172603ed8fb346420.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix typos.
Fix typo in declative example.
test for gdb version before runnning dwarf indexing
Fix Core Text font loading for certain Mac Fonts
Support sub pixel positioning of glyphs in raster engine
Added basic tests for threaded QPainter drawing onto FBOs and PBOs.
Diffstat (limited to 'src/gui/text/qfontengine.cpp')
| -rw-r--r-- | src/gui/text/qfontengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 4348589..6487e29 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -616,7 +616,7 @@ QImage QFontEngine::alphaMapForGlyph(glyph_t glyph, const QTransform &t) return i; } -QImage QFontEngine::alphaRGBMapForGlyph(glyph_t glyph, int /* margin */, const QTransform &t) +QImage QFontEngine::alphaRGBMapForGlyph(glyph_t glyph, QFixed /*subPixelPosition*/, int /* margin */, const QTransform &t) { QImage alphaMask = alphaMapForGlyph(glyph, t); QImage rgbMask(alphaMask.width(), alphaMask.height(), QImage::Format_RGB32); |