Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

5 files changed, 11 insertions, 9 deletions

diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 67c02f2..e031fb5 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -147,7 +147,7 @@ QGLSignalProxy *QGLSignalProxy::instance()
     \brief The QGL namespace specifies miscellaneous identifiers used
     in the Qt OpenGL module.
 
-    \ingroup multimedia
+    \ingroup painting-3D
 */
 
 /*!
@@ -190,7 +190,7 @@ QGLSignalProxy *QGLSignalProxy::instance()
     \brief The QGLFormat class specifies the display format of an OpenGL
     rendering context.
 
-    \ingroup multimedia
+    \ingroup painting-3D
 
     A display format has several characteristics:
     \list
@@ -1554,7 +1554,7 @@ Q_OPENGL_EXPORT QGLShareRegister* qgl_share_reg()
     \class QGLContext
     \brief The QGLContext class encapsulates an OpenGL rendering context.
 
-    \ingroup multimedia
+    \ingroup painting-3D
 
     An OpenGL rendering context is a complete set of OpenGL state
     variables. The rendering context's \l {QGL::FormatOption} {format}
@@ -2775,8 +2775,8 @@ const QGLContext* QGLContext::currentContext()
     \class QGLWidget
     \brief The QGLWidget class is a widget for rendering OpenGL graphics.
 
-    \ingroup multimedia
-    \mainclass
+    \ingroup painting-3D
+
 
     QGLWidget provides functionality for displaying OpenGL graphics
     integrated into a Qt application. It is very simple to use. You
diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp
index 0d38ce7..cdbf1c8 100644
--- a/src/opengl/qglcolormap.cpp
+++ b/src/opengl/qglcolormap.cpp
@@ -45,7 +45,7 @@
     QGLWidgets.
 
     \module OpenGL
-    \ingroup multimedia
+    \ingroup painting-3D
     \ingroup shared
 
     QGLColormap provides a platform independent way of specifying and
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index b93cee8..db33297 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -90,7 +90,7 @@ public:
 
     \since 4.6
 
-    \ingroup multimedia
+    \ingroup painting-3D
 
     A framebuffer object has several characteristics:
     \list
@@ -476,7 +476,7 @@ void QGLFramebufferObjectPrivate::init(const QSize &sz, QGLFramebufferObject::At
     \brief The QGLFramebufferObject class encapsulates an OpenGL framebuffer object.
     \since 4.2
 
-    \ingroup multimedia
+    \ingroup painting-3D
 
     The QGLFramebufferObject class encapsulates an OpenGL framebuffer
     object, defined by the \c{GL_EXT_framebuffer_object} extension. In
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp
index 884bb36..4140bdf 100644
--- a/src/opengl/qglpixelbuffer.cpp
+++ b/src/opengl/qglpixelbuffer.cpp
@@ -44,7 +44,7 @@
     \brief The QGLPixelBuffer class encapsulates an OpenGL pbuffer.
     \since 4.1
 
-    \ingroup multimedia
+    \ingroup painting-3D
 
     Rendering into a pbuffer is normally done using full hardware
     acceleration. This can be significantly faster than rendering
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index e3627ff..f8bffd3 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -55,6 +55,7 @@ QT_BEGIN_NAMESPACE
     \class QGLShaderProgram
     \brief The QGLShaderProgram class allows OpenGL shader programs to be linked and used.
     \since 4.6
+    \ingroup painting-3D
 
     \section1 Introduction
 
@@ -181,6 +182,7 @@ QT_BEGIN_NAMESPACE
     \class QGLShader
     \brief The QGLShader class allows OpenGL shaders to be compiled.
     \since 4.6
+    \ingroup painting-3D
 
     This class supports shaders written in the OpenGL Shading Language (GLSL)
     and in the OpenGL/ES Shading Language (GLSL/ES).