diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 17:53:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 17:53:10 (GMT) |
| commit | ef51033ad135450dd2a0f5efc641b330f8ef63b9 (patch) | |
| tree | e016d899987c30c9cc48d32e451cbfcddbd413de /src/openvg | |
| parent | d194ebdc199fdd85245bfecb766d836dfa79c3f3 (diff) | |
| parent | d190802d33b763e7a21b85fb3dc2ed7c039ddbb6 (diff) | |
| download | Qt-ef51033ad135450dd2a0f5efc641b330f8ef63b9.zip Qt-ef51033ad135450dd2a0f5efc641b330f8ef63b9.tar.gz Qt-ef51033ad135450dd2a0f5efc641b330f8ef63b9.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:
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/openvg')
| -rw-r--r-- | src/openvg/qpaintengine_vg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index ee65e48..aea203f 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -3475,7 +3475,7 @@ void QVGPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem) void QVGPaintEngine::drawStaticTextItem(QStaticTextItem *textItem) { - drawCachedGlyphs(textItem->numGlyphs, textItem->glyphs, textItem->font, textItem->fontEngine, + drawCachedGlyphs(textItem->numGlyphs, textItem->glyphs, textItem->font, textItem->fontEngine(), QPointF(0, 0), textItem->glyphPositions); } |