diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:07:32 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:10:29 +0100 |
| commit | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch) | |
| tree | 156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /src/opengl | |
| parent | bf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff) | |
| parent | 0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/doc/src/qtopengl-index.qdoc | 2 | ||||
| -rw-r--r-- | src/opengl/doc/src/qtopengl-module.qdoc | 2 | ||||
| -rw-r--r-- | src/opengl/qglpaintdevice_p.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/doc/src/qtopengl-index.qdoc b/src/opengl/doc/src/qtopengl-index.qdoc index 4a97da46f7..94109aa706 100644 --- a/src/opengl/doc/src/qtopengl-index.qdoc +++ b/src/opengl/doc/src/qtopengl-index.qdoc @@ -28,7 +28,7 @@ /*! \page qtopengl-index.html \title Qt OpenGL - \brief The QtOpenGL module offers classes that make it easy to + \brief The Qt OpenGL module offers classes that make it easy to use OpenGL in Qt applications. \warning Apart from the \l{QGLWidget} class, this module should not be used diff --git a/src/opengl/doc/src/qtopengl-module.qdoc b/src/opengl/doc/src/qtopengl-module.qdoc index a0aef0e0d3..e75eb49447 100644 --- a/src/opengl/doc/src/qtopengl-module.qdoc +++ b/src/opengl/doc/src/qtopengl-module.qdoc @@ -31,7 +31,7 @@ \ingroup modules \ingroup technology-apis - \brief The QtOpenGL module offers classes that make it easy to + \brief The Qt OpenGL module offers classes that make it easy to use OpenGL in Qt applications. \warning Apart from the \l{QGLWidget} class, this module should not be used diff --git a/src/opengl/qglpaintdevice_p.h b/src/opengl/qglpaintdevice_p.h index b80267e985..4fa17306b5 100644 --- a/src/opengl/qglpaintdevice_p.h +++ b/src/opengl/qglpaintdevice_p.h @@ -47,7 +47,7 @@ // ------------- // // This file is not part of the Qt API. It exists for the convenience -// of the QtOpenGL module. This header file may change from +// of the Qt OpenGL module. This header file may change from // version to version without notice, or even be removed. // // We mean it. |