diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-03 06:30:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-03 06:30:53 (GMT) |
| commit | 966613212de269421944a5df355f54c5a6b36c17 (patch) | |
| tree | c03f711c29571ce3ce4d8c0f23215d57d3458d2a /src/gui/painting/qpaintengine_raster.cpp | |
| parent | 69ab0cd2b51a86fe27c92c7c18390f6791939b53 (diff) | |
| parent | 891221a3f0c952817eb7891b9243827edda61085 (diff) | |
| download | Qt-966613212de269421944a5df355f54c5a6b36c17.zip Qt-966613212de269421944a5df355f54c5a6b36c17.tar.gz Qt-966613212de269421944a5df355f54c5a6b36c17.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix Malayalam Rendering - 'Ra' is PreBase
Update .def files for QtGui and QtOpenVG
Use 32bit textures for alpha textures after all.
One more fix for dithering.
Doc: Fixing typo
Fix QTBUG-14640:oci performance problem with qlonglong
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
Diffstat (limited to 'src/gui/painting/qpaintengine_raster.cpp')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 3717ed9..161ced5 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -3301,7 +3301,7 @@ void QRasterPaintEngine::drawStaticTextItem(QStaticTextItem *textItem) ensureState(); drawCachedGlyphs(textItem->numGlyphs, textItem->glyphs, textItem->glyphPositions, - textItem->fontEngine); + textItem->fontEngine()); } /*! |