diff options
| author | hjk <qtc-committer@nokia.com> | 2011-02-04 12:27:55 (GMT) |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2011-02-04 12:27:55 (GMT) |
| commit | 59f440ef78d310fdf18d655b2b768b6e59786fa9 (patch) | |
| tree | 0668c870ed64f208183b2cae920480d3436358cf | |
| parent | e97d3f3f571e3cc5f5851ea2e131ac92212802dd (diff) | |
| download | Qt-59f440ef78d310fdf18d655b2b768b6e59786fa9.zip Qt-59f440ef78d310fdf18d655b2b768b6e59786fa9.tar.gz Qt-59f440ef78d310fdf18d655b2b768b6e59786fa9.tar.bz2 | |
Fix warning about deprecated conversions of string literals to char *
Reviewed-by: Samuel Rødal
| -rw-r--r-- | src/opengl/qglshaderprogram.cpp | 4 |
1 files 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) |