From 6aef733a7a80cc937ba67c982a41a7338379d401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 17 Feb 2014 13:10:52 +0100 Subject: [PATCH] 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 --- src/gui/opengl/qopenglpaintengine.cpp | 4 ++-- 1 file 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; }