diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-31 01:58:08 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-31 01:58:08 (GMT) |
| commit | 9c5cea7d447019dcc5bad19ea3c27a358cccb2ed (patch) | |
| tree | b10e3a9a0e9d005a31b20fe011a11eace86b4c7f /src/opengl/qpaintengine_opengl.cpp | |
| parent | 7184c41453c64f177f337b173f4ca82afead731d (diff) | |
| parent | 1e60f5fb1c1ad9289247ef3bc47a94434b27dbea (diff) | |
| download | Qt-9c5cea7d447019dcc5bad19ea3c27a358cccb2ed.zip Qt-9c5cea7d447019dcc5bad19ea3c27a358cccb2ed.tar.gz Qt-9c5cea7d447019dcc5bad19ea3c27a358cccb2ed.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/opengl/qpaintengine_opengl.cpp')
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index 28d37bc..12c487d 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -4999,7 +4999,7 @@ void QOpenGLPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textIte { QStaticTextItem staticTextItem; - staticTextItem.chars = ti.chars; + staticTextItem.chars = const_cast<QChar *>(ti.chars); staticTextItem.fontEngine = ti.fontEngine; staticTextItem.glyphs = glyphs.data(); staticTextItem.numChars = ti.num_chars; |