diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 19:42:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 19:42:17 (GMT) |
| commit | 7bf8fb931459c56135feb2d0168431f393259db2 (patch) | |
| tree | 3cd60af8028637e8be5ad5bce0cea191e3dc34d0 /dist | |
| parent | 9c2522f2e28c2f22b24500b51ed37590666c1f84 (diff) | |
| parent | dfb0f8600187b44c3a3e10ef40ae2733de88f241 (diff) | |
| download | Qt-7bf8fb931459c56135feb2d0168431f393259db2.zip Qt-7bf8fb931459c56135feb2d0168431f393259db2.tar.gz Qt-7bf8fb931459c56135feb2d0168431f393259db2.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-4.6.4 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/dist/changes-4.6.4 b/dist/changes-4.6.4 index 389aa3a..3949b9a 100644 --- a/dist/changes-4.6.4 +++ b/dist/changes-4.6.4 @@ -66,8 +66,6 @@ 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. * [QTBUG-12554] Wrong OpenGLVersionFlags on OpenGL 4.0 systems. QtScript @@ -109,7 +107,7 @@ Third party components Qt for Unix (X11 and Mac OS X) ------------------------------ - - + - Qt for Linux/X11 ---------------- |