diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-05-07 12:01:46 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-05-07 12:02:41 +0200 |
commit | db44b891fb8710121fec7dc4fa3bd91493dc2a1c (patch) | |
tree | f6729181387ac4a4e4fa2dad445febebba25812b /src/opengl/doc/src | |
parent | c917579a15d60a7b70c5fc5f00f6451da7c4e608 (diff) | |
parent | 95045168470f8865263145b86597b6641b4cc035 (diff) |
Merge branch 'stable' into dev
Change-Id: Ica003a10ede86914bbbb062a2dc277a2ce39a259
Diffstat (limited to 'src/opengl/doc/src')
-rw-r--r-- | src/opengl/doc/src/qtopengl-index.qdoc | 2 | ||||
-rw-r--r-- | src/opengl/doc/src/qtopengl-module.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/doc/src/qtopengl-index.qdoc b/src/opengl/doc/src/qtopengl-index.qdoc index 94109aa706..fc131c4b17 100644 --- a/src/opengl/doc/src/qtopengl-index.qdoc +++ b/src/opengl/doc/src/qtopengl-index.qdoc @@ -67,6 +67,6 @@ OpenGL module can take advantage of the whole Qt API for non-OpenGL-specific GUI functionality. - The \l{Qt OpenGL C++ classes} page gives an overview over the available classes + The \l{Qt OpenGL C++ Classes} page gives an overview over the available classes int this module. */ diff --git a/src/opengl/doc/src/qtopengl-module.qdoc b/src/opengl/doc/src/qtopengl-module.qdoc index e75eb49447..9c15a54428 100644 --- a/src/opengl/doc/src/qtopengl-module.qdoc +++ b/src/opengl/doc/src/qtopengl-module.qdoc @@ -27,7 +27,7 @@ /*! \module QtOpenGL - \title Qt OpenGL C++ classes + \title Qt OpenGL C++ Classes \ingroup modules \ingroup technology-apis |