diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2010-05-27 07:52:25 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2010-05-27 07:53:55 (GMT) |
| commit | 3de02411c14eb0cb57bc000cee06e90fe510c619 (patch) | |
| tree | 42c2a7f2da46719ce6fa1e476cc5bf78926c6a0b | |
| parent | 7cc8e62f74f66f20c216a8bc8c3187c989a3dcb4 (diff) | |
| download | Qt-3de02411c14eb0cb57bc000cee06e90fe510c619.zip Qt-3de02411c14eb0cb57bc000cee06e90fe510c619.tar.gz Qt-3de02411c14eb0cb57bc000cee06e90fe510c619.tar.bz2 | |
Fixed compilation of QtOpenGL.
Reviewed-by: Eskil
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 4461358..5758b25 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -1401,7 +1401,7 @@ void QGL2PaintEngineEx::drawTextItem(const QPointF &p, const QTextItem &textItem { 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; 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; |