diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-04 22:45:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-04 22:45:05 (GMT) |
| commit | 31ac30b5a36a34dbd69b4156cc22bbea491d8b09 (patch) | |
| tree | 6538eb40a46048ce57a0ce7b67ebd62e0a89a504 /src/opengl | |
| parent | 4f09b0b7823dfe17e2f7d7fafafa7934414f3d88 (diff) | |
| parent | 59f440ef78d310fdf18d655b2b768b6e59786fa9 (diff) | |
| download | Qt-31ac30b5a36a34dbd69b4156cc22bbea491d8b09.zip Qt-31ac30b5a36a34dbd69b4156cc22bbea491d8b09.tar.gz Qt-31ac30b5a36a34dbd69b4156cc22bbea491d8b09.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix warning about deprecated conversions of string literals to char *
Diffstat (limited to 'src/opengl')
| -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) |