diff options
| author | Tor Arne Vestbø <torarnv@gmail.com> | 2014-02-17 13:10:52 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-17 16:44:39 +0100 |
| commit | 6aef733a7a80cc937ba67c982a41a7338379d401 (patch) | |
| tree | b859a280e1891af72042dfb48a1089f45372b280 /src/gui/opengl | |
| parent | 8e57ad1a270df164cebcac7b0e2923eac6df9e37 (diff) | |
Fix glyph cache type logic after 97c187da3c1381bc55dd16976
The setting of the default format of Raster_A8 was mistakenly
moved down to below the override of Raster_RGBMask.
Change-Id: I52ee19180471c6f5c8d6824ee35f8d39632c9d94
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/qopenglpaintengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp index 6525a4dad9..e91ada7b3a 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp @@ -2012,6 +2012,8 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) glDisable(GL_DEPTH_TEST); glDisable(GL_SCISSOR_TEST); + d->glyphCacheType = QFontEngineGlyphCache::Raster_A8; + #ifndef QT_OPENGL_ES_2 if (!QOpenGLFunctions::isES()) { glDisable(GL_MULTISAMPLE); @@ -2025,8 +2027,6 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) d->multisamplingAlwaysEnabled = d->device->context()->format().samples() > 1; } - d->glyphCacheType = QFontEngineGlyphCache::Raster_A8; - return true; } |