diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-25 08:03:17 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-25 08:03:17 (GMT) |
| commit | 07cee1caa5238a9c4a132b6e37a0ef82b665c568 (patch) | |
| tree | 0c32d805837dc734b813ca76741a744a4c637a2c /src/opengl/qgl.cpp | |
| parent | b23dc7fb8bc8de6617684249411b5399f1d06631 (diff) | |
| parent | 662494c7a20d6612948a672e5e9c87b9173d9560 (diff) | |
| download | Qt-07cee1caa5238a9c4a132b6e37a0ef82b665c568.zip Qt-07cee1caa5238a9c4a132b6e37a0ef82b665c568.tar.gz Qt-07cee1caa5238a9c4a132b6e37a0ef82b665c568.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys
Conflicts:
src/gui/styles/qs60style.cpp
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 04bc611..8f963f8 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -2588,7 +2588,7 @@ const QGLContext* QGLContext::currentContext() \i paintGL() - Renders the OpenGL scene. Gets called whenever the widget needs to be updated. \i resizeGL() - Sets up the OpenGL viewport, projection, etc. Gets - called whenever the the widget has been resized (and also when it + called whenever the widget has been resized (and also when it is shown for the first time because all newly created widgets get a resize event automatically). \i initializeGL() - Sets up the OpenGL rendering context, defines display |