diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-13 04:21:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-13 04:21:21 (GMT) |
| commit | 550ac75e1639362010e8c24010a8b541a83d8512 (patch) | |
| tree | 8fd46e0a8fbd83c5bd1bc7ba236c07e3a8b2d32d | |
| parent | 1534ac035f0dc5ca82e84ecbb79d2f50e689e34a (diff) | |
| parent | 36a98407ce53e2d7ae6f1ef3b65794b113ae1606 (diff) | |
| download | Qt-550ac75e1639362010e8c24010a8b541a83d8512.zip Qt-550ac75e1639362010e8c24010a8b541a83d8512.tar.gz Qt-550ac75e1639362010e8c24010a8b541a83d8512.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:
Update changes-4.6.4 with recent shader program changes
| -rw-r--r-- | dist/changes-4.6.4 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dist/changes-4.6.4 b/dist/changes-4.6.4 index ab59dc5..dbb2189 100644 --- a/dist/changes-4.6.4 +++ b/dist/changes-4.6.4 @@ -64,6 +64,8 @@ QtOpenGL -------- - QGLShaderProgram + * [QTBUG-12478] Don't resolve GLSL extensions if no shaders. + * [QTBUG-12591] setUniformValue(QSize) was setting (w,w) not (w,h). * [QTBUG-12862] Don't #define highp/mediump/lowp if the desktop OpenGL implementation has the GL_ARB_ES2_compatibility extension. |