Added OpenGL example and documentation.

Change-Id: I2d9d4e52caf0a39fef9648d8a9e83a0c1328f650
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>

1 files changed, 13 insertions, 4 deletions

diff --git a/src/gui/doc/src/qtgui.qdoc b/src/gui/doc/src/qtgui.qdoc
index 0421b172cf..41cdfc4b3d 100644
--- a/src/gui/doc/src/qtgui.qdoc
+++ b/src/gui/doc/src/qtgui.qdoc
@@ -114,10 +114,19 @@
     QWindow supports rendering using desktop OpenGL, OpenGL ES 1.1 and
     OpenGL ES 2.0, depending on what the platform supports. OpenGL
     rendering is enabled by setting the QWindow's surface type to
-    QSurface::OpenGLSurface, then creating a QOpenGLContext to manage
-    the native OpenGL context.
-
-    For more information, see \l {OpenGL Enablers}.
+    QSurface::OpenGLSurface, choosing the format attributes with
+    QSurfaceFormat, and then creating a QOpenGLContext to manage
+    the native OpenGL context. In addition, Qt has QOpenGLPaintDevice,
+    which enables the use of OpenGL accelerated QPainter rendering, as well as
+    convenience classes that simplify the writing of OpenGL code and hides the
+    complexities of extension handling and the differences between OpenGL ES 2
+    and desktop OpenGL. The convenience classes include QOpenGLFunctions that
+    lets an application use all the OpenGL ES 2 functions on desktop OpenGL
+    without having to manually resolve the OpenGL function pointers and some
+    classes that wrap native OpenGL resources in a simpler Qt API:
+    QOpenGLBuffer, QOpenGLFramebufferObject, and QOpenGLShaderProgram.
+
+    For more information, see the \l {OpenGL Window Example}.
 
     The Qt GUI module also contains a few math classes to aid with the
     most common mathmatical operations related to 3D graphics. These