diff options
| author | aavit <eirik.aavitsland@digia.com> | 2013-07-09 10:28:27 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-10 11:58:21 (GMT) |
| commit | f66df7b112b8626c5f1cbd19875d97e8c5de1f84 (patch) | |
| tree | b38fa47127a8ff1944b932d93c867f61d01ac662 /src | |
| parent | 11ed361d1d66f011f6bc56d70d3adc4d235c3e52 (diff) | |
| download | Qt-f66df7b112b8626c5f1cbd19875d97e8c5de1f84.zip Qt-f66df7b112b8626c5f1cbd19875d97e8c5de1f84.tar.gz Qt-f66df7b112b8626c5f1cbd19875d97e8c5de1f84.tar.bz2 | |
Fixes: ASSERT in qpaintengine_x11 when using native graphicssystem
QFontEngineFT::loadGlyph() was called with wrong number/type of
arguments, but as the compiler silently accepted an enum value as
a QFixed, and the rest had default values, this was not discovered.
Fix not needed in Qt5, since this functionality is not there.
Task-number: QTBUG-32166
Change-Id: Ifc5be593530fee5ff0e329a9f56f6ba48eea6cdf
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qpaintengine_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp index a0bbbe4..c180173 100644 --- a/src/gui/painting/qpaintengine_x11.cpp +++ b/src/gui/painting/qpaintengine_x11.cpp @@ -2321,7 +2321,7 @@ static QPainterPath path_for_glyphs(const QVarLengthArray<glyph_t> &glyphs, ft->lockFace(); int i = 0; while (i < glyphs.size()) { - QFontEngineFT::Glyph *glyph = ft->loadGlyph(glyphs[i], QFontEngineFT::Format_Mono); + QFontEngineFT::Glyph *glyph = ft->loadGlyph(glyphs[i], 0, QFontEngineFT::Format_Mono); // #### fix case where we don't get a glyph if (!glyph) break; |