summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-04-20 23:31:42 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-05-01 00:17:23 (GMT)
commit17ee6906eb726ea9b03c6c7e67448cf3d924f0f8 (patch)
tree16d79aa722264149eed4fcaf148d80ee3a0f1121 /demos
parent97da797fc9e408e1b0a44d2ac109750294c82574 (diff)
downloadQt-17ee6906eb726ea9b03c6c7e67448cf3d924f0f8.zip
Qt-17ee6906eb726ea9b03c6c7e67448cf3d924f0f8.tar.gz
Qt-17ee6906eb726ea9b03c6c7e67448cf3d924f0f8.tar.bz2
Rename QGLShader(Program)::errors() to log()
The shader compilers also report warnings, so it is more appropriate to call the string a log. Reviewed-by: trustme
Diffstat (limited to 'demos')
-rw-r--r--demos/boxes/scene.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp
index e5aab75..cd9671e 100644
--- a/demos/boxes/scene.cpp
+++ b/demos/boxes/scene.cpp
@@ -620,11 +620,11 @@ void Scene::initGL()
if (!program->link()) {
qWarning("Failed to compile and link shader program");
qWarning("Vertex shader log:");
- qWarning() << m_vertexShader->errors();
+ qWarning() << m_vertexShader->log();
qWarning() << "Fragment shader log ( file =" << file.absoluteFilePath() << "):";
- qWarning() << shader->errors();
+ qWarning() << shader->log();
qWarning("Shader program log:");
- qWarning() << program->errors();
+ qWarning() << program->log();
delete shader;
delete program;