From 59f440ef78d310fdf18d655b2b768b6e59786fa9 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 4 Feb 2011 13:27:55 +0100
Subject: Fix warning about deprecated conversions of string literals to char *
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Samuel Rødal
---
 src/opengl/qglshaderprogram.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 7f41339..4598bff 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -261,14 +261,14 @@ bool QGLShaderPrivate::compile(QGLShader *q)
         log = QString::fromLatin1(logbuf);
         QString name = q->objectName();
 
-        char *types[] = {
+        const char *types[] = {
             "Fragment",
             "Vertex",
             "Geometry",
             ""
         };
 
-        char *type = types[3];
+        const char *type = types[3];
         if (shaderType == QGLShader::Fragment)
             type = types[0];
         else if (shaderType == QGLShader::Vertex)
-- 
cgit v0.12