summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qrawfont.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-09-28 11:55:00 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-09-28 11:55:00 (GMT)
commitd81ddfd44455c79d0a44ab1caf29939b287dd895 (patch)
tree9b4383c5c23b405170ff9b2b5edb6762165828bb /src/gui/text/qrawfont.cpp
parent89ae1ec634f82f89e97f3e19b5d5fb0da9b3092f (diff)
parentc75aabbb022e3c2db246e2fd90a36662cf28ec24 (diff)
downloadQt-d81ddfd44455c79d0a44ab1caf29939b287dd895.zip
Qt-d81ddfd44455c79d0a44ab1caf29939b287dd895.tar.gz
Qt-d81ddfd44455c79d0a44ab1caf29939b287dd895.tar.bz2
Merge remote-tracking branch 'mainline/4.8'
Diffstat (limited to 'src/gui/text/qrawfont.cpp')
-rw-r--r--src/gui/text/qrawfont.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp
index 61bc63e..7c7d4eb 100644
--- a/src/gui/text/qrawfont.cpp
+++ b/src/gui/text/qrawfont.cpp
@@ -238,7 +238,8 @@ void QRawFont::loadFromData(const QByteArray &fontData,
If \a antialiasingType is set to QRawFont::SubPixelAntialiasing, then the resulting image will be
in QImage::Format_RGB32 and the RGB values of each pixel will represent the subpixel opacities of
the pixel in the rasterization of the glyph. Otherwise, the image will be in the format of
- QImage::Format_A8 and each pixel will contain the opacity of the pixel in the rasterization.
+ QImage::Format_Indexed8 and each pixel will contain the opacity of the pixel in the
+ rasterization.
\sa pathForGlyph(), QPainter::drawGlyphRun()
*/