From 3de02411c14eb0cb57bc000cee06e90fe510c619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Thu, 27 May 2010 09:52:25 +0200
Subject: Fixed compilation of QtOpenGL.

Reviewed-by: Eskil
---
 src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 2 +-
 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;
-- 
cgit v0.12