diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-03 01:00:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-03 01:00:23 (GMT) |
| commit | 105704d626f293f0c8fc08ef6978c401402148c6 (patch) | |
| tree | d96b76ca170f739770bc77658102f0d15f59ca97 | |
| parent | 374432a611c25d1c984220de410f5a65303b71f5 (diff) | |
| parent | 88917087b64a014a69d12946a162ab6588e733e6 (diff) | |
| download | Qt-105704d626f293f0c8fc08ef6978c401402148c6.zip Qt-105704d626f293f0c8fc08ef6978c401402148c6.tar.gz Qt-105704d626f293f0c8fc08ef6978c401402148c6.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
setUniformValue(QSize) was setting (w,w) not (w,h)
| -rw-r--r-- | src/opengl/qglshaderprogram.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index bbfc2d5..edbb635 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -1971,7 +1971,7 @@ void QGLShaderProgram::setUniformValue(int location, const QSize& size) Q_D(QGLShaderProgram); Q_UNUSED(d); if (location != -1) { - GLfloat values[4] = {size.width(), size.width()}; + GLfloat values[4] = {size.width(), size.height()}; glUniform2fv(location, 1, values); } } |