diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-24 09:09:15 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-01-14 13:06:48 (GMT) |
| commit | 378c08e56110b2a57c0112e5bfb189e28cc8e88f (patch) | |
| tree | b1b9c96bf9676c8a23d688827cd34499de5342b3 /src/opengl/qpaintengine_opengl.cpp | |
| parent | bf919e06127962836a6b566bf119cf248c6a999b (diff) | |
| download | Qt-378c08e56110b2a57c0112e5bfb189e28cc8e88f.zip Qt-378c08e56110b2a57c0112e5bfb189e28cc8e88f.tar.gz Qt-378c08e56110b2a57c0112e5bfb189e28cc8e88f.tar.bz2 | |
Compile
Update the code to compile with merged changes.
Diffstat (limited to 'src/opengl/qpaintengine_opengl.cpp')
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index d6175e9..fecbc45 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -4828,7 +4828,7 @@ void QGLGlyphCache::cacheGlyphs(QGLContext *context, QFontEngine *fontEngine, } QImage glyph_im(fontEngine->alphaMapForGlyph(glyphs[i])); - glyph_im = glyph_im.convertToFormat(QImage::Format_Indexed8); + glyph_im = glyph_im.convertToFormat(QImage::Format_Indexed8); glyph_width = glyph_im.width(); Q_ASSERT(glyph_width >= 0); // pad the glyph width to an even number |