diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-26 23:34:59 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-26 23:34:59 (GMT) |
| commit | be9968c0ee3943c7cc169b4ad8e36155b06bf620 (patch) | |
| tree | fd39afb623d7a787a42f71f148ebd051fdd51a14 /dist/changes-4.6.4 | |
| parent | d477cc1498ccf2204dd0e5cd6676f5c0788a9090 (diff) | |
| parent | ef4c65fc364a0262389c0497092a0fa5e1f7d4c3 (diff) | |
| download | Qt-be9968c0ee3943c7cc169b4ad8e36155b06bf620.zip Qt-be9968c0ee3943c7cc169b4ad8e36155b06bf620.tar.gz Qt-be9968c0ee3943c7cc169b4ad8e36155b06bf620.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7
Diffstat (limited to 'dist/changes-4.6.4')
| -rw-r--r-- | dist/changes-4.6.4 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/dist/changes-4.6.4 b/dist/changes-4.6.4 index 381023f..389aa3a 100644 --- a/dist/changes-4.6.4 +++ b/dist/changes-4.6.4 @@ -63,8 +63,12 @@ QtNetwork QtOpenGL -------- - - foo - * bar + - 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. + * [QTBUG-12554] Wrong OpenGLVersionFlags on OpenGL 4.0 systems. QtScript -------- |