summaryrefslogtreecommitdiffstats
path: root/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-07-07 09:04:33 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-07-07 09:53:06 (GMT)
commit4e915e3942c1523ffdda01e36c019f842062b794 (patch)
tree48c20f6d1d9756ae75b7e6d3d9ef46250fa80f6f /src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp
parent9aef5ac9fd2452657ca018325db54e374bdeb164 (diff)
downloadQt-4e915e3942c1523ffdda01e36c019f842062b794.zip
Qt-4e915e3942c1523ffdda01e36c019f842062b794.tar.gz
Qt-4e915e3942c1523ffdda01e36c019f842062b794.tar.bz2
Fix text drawing into alpha pixmap with opengl engine
The merge 03dc74984749adf5b11482bf871a47086217845c mistakenly merged the glyphMargin() (which had been removed in 4.7 because QGLTextureGlyphCache now inherits from the image glyph cache) with the glyphPadding() which had been introduced in separate commits in both branches (probably backported.) This broke text drawing into a pixmap with an alpha with the GL engine, because we'd assume a margin of 1, but the alphaMapForGlyph() function doesn't support margins. Task-number: QTBUG-11987 Reviewed-by: Gunnar
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp')
0 files changed, 0 insertions, 0 deletions