qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix glyph cache type logic after 97c187da3c 

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>
This commit is contained in:
Tor Arne Vestbø 2014-02-17 13:10:52 +01:00 committed by The Qt Project
parent 8e57ad1a27
commit 6aef733a7a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/opengl/qopenglpaintengine.cpp
View File

@ -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;
}