diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-20 08:04:29 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-20 08:04:29 (GMT) |
| commit | 30b45ba2b11342a9e7cc06b68237b68a68955213 (patch) | |
| tree | 1018c188375b3217b31abe9b7a0883ee1184a447 /dist | |
| parent | ce27cf24539e0c7971937e55d8539496ad51ee52 (diff) | |
| parent | 8f10ca802dee1ed110f301191c4a56a85575033c (diff) | |
| download | Qt-30b45ba2b11342a9e7cc06b68237b68a68955213.zip Qt-30b45ba2b11342a9e7cc06b68237b68a68955213.tar.gz Qt-30b45ba2b11342a9e7cc06b68237b68a68955213.tar.bz2 | |
Merge remote branch 'origin/master' into qt-master-from-4.6
Conflicts:
configure.exe
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-4.7.0 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0 index 3504763..013f1ce 100644 --- a/dist/changes-4.7.0 +++ b/dist/changes-4.7.0 @@ -25,7 +25,7 @@ General Improvements - Documentation and Examples - Support for the GL_EXT_geometry_shader4, aka Geometry Shaders, was added - to QGLShaderProgram. + to QGLShaderProgram. Third party components ---------------------- @@ -35,6 +35,10 @@ Third party components * Library * **************************************************************************** + - QPrinter + * Obsoleted the slightly confusing setNumCopies() and numCopies() + functions, and replaced them with setCopyCount(), copyCount() and + supportsMultipleCopies(). **************************************************************************** * Database Drivers * |