diff --git a/src/gui/opengl/qopenglfunctions_1_0.cpp b/src/gui/opengl/qopenglfunctions_1_0.cpp index b618dcb5cf8b3758bc5ffedbeff20133a0d944af..f368bda76d7a4508e77ba6a4b2234ea7b083ceed 100644 --- a/src/gui/opengl/qopenglfunctions_1_0.cpp +++ b/src/gui/opengl/qopenglfunctions_1_0.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_1_0 class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_1_0 class provides all functions for OpenGL 1.0 specification. + + This class is a wrapper for functions from OpenGL 1.0 specification. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_1_1.cpp b/src/gui/opengl/qopenglfunctions_1_1.cpp index bf032b5cf91b884eb24d2c838507f79c96330664..d101c5c4065b12795f134188ac7cda52c1669c0b 100644 --- a/src/gui/opengl/qopenglfunctions_1_1.cpp +++ b/src/gui/opengl/qopenglfunctions_1_1.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_1_1 class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_1_1 class provides all functions for OpenGL 1.1 specification. + + This class is a wrapper for functions from OpenGL 1.1 specification. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_1_2.cpp b/src/gui/opengl/qopenglfunctions_1_2.cpp index 2b1490068073aa1ab5dc2299d7c2eb045f2ff74b..1c6ad1ddffc1c408f5b5fa0e2ff1acd95345e53b 100644 --- a/src/gui/opengl/qopenglfunctions_1_2.cpp +++ b/src/gui/opengl/qopenglfunctions_1_2.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_1_2 class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_1_2 class provides all functions for OpenGL 1.2 specification. + + This class is a wrapper for functions from OpenGL 1.2 specification. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_1_3.cpp b/src/gui/opengl/qopenglfunctions_1_3.cpp index 94605f8638bc9c4c4108c97a163d2d62cb4f7cfa..aef3789f9a45a9812403177b58363e765d2d179e 100644 --- a/src/gui/opengl/qopenglfunctions_1_3.cpp +++ b/src/gui/opengl/qopenglfunctions_1_3.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_1_3 class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_1_3 class provides all functions for OpenGL 1.3 specification. + + This class is a wrapper for functions from OpenGL 1.3 specification. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_1_4.cpp b/src/gui/opengl/qopenglfunctions_1_4.cpp index e3035eeb55aa036dc5ed4d17991bbc58f6ed79c7..24b4c0ba7a68a0145de088dc26bc3e12de696455 100644 --- a/src/gui/opengl/qopenglfunctions_1_4.cpp +++ b/src/gui/opengl/qopenglfunctions_1_4.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_1_4 class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_1_4 class provides all functions for OpenGL 1.4 specification. + + This class is a wrapper for functions from OpenGL 1.4 specification. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_1_5.cpp b/src/gui/opengl/qopenglfunctions_1_5.cpp index 581ed14aac7394a4cbcded1d76cd5c247ccfe277..b5a9486629fe99cc1625cac4eae24cdfc193effb 100644 --- a/src/gui/opengl/qopenglfunctions_1_5.cpp +++ b/src/gui/opengl/qopenglfunctions_1_5.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_1_5 class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_1_5 class provides all functions for OpenGL 1.5 specification. + + This class is a wrapper for functions from OpenGL 1.5 specification. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_2_0.cpp b/src/gui/opengl/qopenglfunctions_2_0.cpp index 2736d4a03014d9869a46295fb9c21a9c2e77d522..0645750858713e3d9fb0384f62047378b5a9ce73 100644 --- a/src/gui/opengl/qopenglfunctions_2_0.cpp +++ b/src/gui/opengl/qopenglfunctions_2_0.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_2_0 class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_2_0 class provides all functions for OpenGL 2.0 specification. + + This class is a wrapper for functions from OpenGL 2.0 specification. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_2_1.cpp b/src/gui/opengl/qopenglfunctions_2_1.cpp index ed94131e3377c5fab3e771636a06108eb804981d..133f3bf0cb5bf54f8551eddcc4df494726732cf8 100644 --- a/src/gui/opengl/qopenglfunctions_2_1.cpp +++ b/src/gui/opengl/qopenglfunctions_2_1.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_2_1 class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_2_1 class provides all functions for OpenGL 2.1 specification. + + This class is a wrapper for functions from OpenGL 2.1 specification. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_3_0.cpp b/src/gui/opengl/qopenglfunctions_3_0.cpp index e80235b9578915d5b3d31062d40a2a03a3a3460d..ae56b50b31e452ba56fb708ab9252e5f32aa9867 100644 --- a/src/gui/opengl/qopenglfunctions_3_0.cpp +++ b/src/gui/opengl/qopenglfunctions_3_0.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_3_0 class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_3_0 class provides all functions for OpenGL 3.0 specification. + + This class is a wrapper for functions from OpenGL 3.0 specification. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_3_1.cpp b/src/gui/opengl/qopenglfunctions_3_1.cpp index ab48658bfc2082185d0e8721e6a47f7c9aa0ae5d..5014fdb62c8dd74258381669fb50b047c859edf9 100644 --- a/src/gui/opengl/qopenglfunctions_3_1.cpp +++ b/src/gui/opengl/qopenglfunctions_3_1.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_3_1 class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_3_1 class provides all functions for OpenGL 3.1 specification. + + This class is a wrapper for functions from OpenGL 3.1 specification. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp b/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp index 171b7454f41e06a4db002d712947269f9d289cb6..a6de8fd0fe82b8bb9651b24f9c2d3e242d19847b 100644 --- a/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp +++ b/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_3_2_Compatibility class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_3_2_Compatibility class provides all functions for OpenGL 3.2 compatibility profile. + + This class is a wrapper for functions from OpenGL 3.2 compatibility profile. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_3_2_core.cpp b/src/gui/opengl/qopenglfunctions_3_2_core.cpp index 48dec2996273bb34b95caf92482974ded451b777..2c41d3a5fe1688684a8091315443c70d2944b588 100644 --- a/src/gui/opengl/qopenglfunctions_3_2_core.cpp +++ b/src/gui/opengl/qopenglfunctions_3_2_core.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_3_2_Core class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_3_2_Core class provides all functions for OpenGL 3.2 core profile. + + This class is a wrapper for functions from OpenGL 3.2 core profile. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp b/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp index 8bebc7d0bca4ed0f0c864b5c8a4ea719aee8d47d..dc36eba1ad86a407dd8b9d08b14bf93681b94370 100644 --- a/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp +++ b/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_3_3_Compatibility class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_3_3_Compatibility class provides all functions for OpenGL 3.3 compatibility profile. + + This class is a wrapper for functions from OpenGL 3.3 compatibility profile. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_3_3_core.cpp b/src/gui/opengl/qopenglfunctions_3_3_core.cpp index 941f9c38b6193b38b15fd83c5df0110bdf7fd1b0..5a1e238d0ee6580e29894d06b7aa080acd252c9e 100644 --- a/src/gui/opengl/qopenglfunctions_3_3_core.cpp +++ b/src/gui/opengl/qopenglfunctions_3_3_core.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_3_3_Core class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_3_3_Core class provides all functions for OpenGL 3.3 core profile. + + This class is a wrapper for functions from OpenGL 3.3 core profile. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp index 7ab068808447f92715a8de6dbcaf0bc10516275f..7affa43da160c7a6e5f7b95c22ecc0731180c740 100644 --- a/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp +++ b/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_4_0_Compatibility class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_4_0_Compatibility class provides all functions for OpenGL 4.0 compatibility profile. + + This class is a wrapper for functions from OpenGL 4.0 compatibility profile. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_4_0_core.cpp b/src/gui/opengl/qopenglfunctions_4_0_core.cpp index a4bf66a44bc4fd31dce6db8b334ef6b16b5d53a6..5e8bd8d6a5c96ef17f43a66b5fae2586e63ac33c 100644 --- a/src/gui/opengl/qopenglfunctions_4_0_core.cpp +++ b/src/gui/opengl/qopenglfunctions_4_0_core.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_4_0_Core class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_4_0_Core class provides all functions for OpenGL 4.0 core profile. + + This class is a wrapper for functions from OpenGL 4.0 core profile. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp index a0ea4a052a4c0e682f75d885729872c565c6441f..44e937557afbeaae3d6b3f1b73a7e57e722df9a7 100644 --- a/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp +++ b/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_4_1_Compatibility class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_4_1_Compatibility class provides all functions for OpenGL 4.1 compatibility profile. + + This class is a wrapper for functions from OpenGL 4.1 compatibility profile. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_4_1_core.cpp b/src/gui/opengl/qopenglfunctions_4_1_core.cpp index 474397bb1f8bdf38ea73bbcb53bf57eaa1e774d0..04fcc78d5db02f884bf2989fbab2bbb87fb55241 100644 --- a/src/gui/opengl/qopenglfunctions_4_1_core.cpp +++ b/src/gui/opengl/qopenglfunctions_4_1_core.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_4_1_Core class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_4_1_Core class provides all functions for OpenGL 4.1 core profile. + + This class is a wrapper for functions from OpenGL 4.1 core profile. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp index 6d19fff92b2de36806e2d3bd7d6f195a28a6c953..1329327f3e06d1a90595c5f7412528b136040d73 100644 --- a/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp +++ b/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_4_2_Compatibility class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_4_2_Compatibility class provides all functions for OpenGL 4.2 compatibility profile. + + This class is a wrapper for functions from OpenGL 4.2 compatibility profile. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_4_2_core.cpp b/src/gui/opengl/qopenglfunctions_4_2_core.cpp index 51ba3e8097c1baa8b8354403ab027fc654e85909..652d5810c55a3e40ca9a938a8ec3f306157a53e3 100644 --- a/src/gui/opengl/qopenglfunctions_4_2_core.cpp +++ b/src/gui/opengl/qopenglfunctions_4_2_core.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_4_2_Core class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_4_2_Core class provides all functions for OpenGL 4.2 core profile. + + This class is a wrapper for functions from OpenGL 4.2 core profile. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp index de6cc185c68242a535dfd4b5c5a45e51921ba781..19fffc8f2ecdd9f1c3cc77b67582926ec62209ed 100644 --- a/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp +++ b/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_4_3_Compatibility class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_4_3_Compatibility class provides all functions for OpenGL 4.3 compatibility profile. + + This class is a wrapper for functions from OpenGL 4.3 compatibility profile. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_4_3_core.cpp b/src/gui/opengl/qopenglfunctions_4_3_core.cpp index 29fc8368aa22fc72227481d25e3a74dd4012d14b..b9659eeb8803a97d8f1fa4a62a2c7918e6b45d3b 100644 --- a/src/gui/opengl/qopenglfunctions_4_3_core.cpp +++ b/src/gui/opengl/qopenglfunctions_4_3_core.cpp @@ -58,7 +58,11 @@ QT_BEGIN_NAMESPACE \inmodule QtGui \since 5.1 \wrapper - \brief The QOpenGLFunctions_4_3_Core class provides all functions for this version and profile of OpenGL. + \brief The QOpenGLFunctions_4_3_Core class provides all functions for OpenGL 4.3 core profile. + + This class is a wrapper for functions from OpenGL 4.3 core profile. + See reference pages on \l {http://www.opengl.org/sdk/docs/}{opengl.org} + for function documentation. \sa QAbstractOpenGLFunctions */ diff --git a/src/gui/opengl/qopenglfunctions_es2.cpp b/src/gui/opengl/qopenglfunctions_es2.cpp index 20a4b50994a10e8837a45c3a14260b978506a124..5e0efbd02eca6b6f6c011e8a5beee72d3b05a13f 100644 --- a/src/gui/opengl/qopenglfunctions_es2.cpp +++ b/src/gui/opengl/qopenglfunctions_es2.cpp @@ -51,6 +51,10 @@ QT_BEGIN_NAMESPACE \wrapper \brief The QOpenGLFunctions_ES2 class provides all functions for OpenGL ES 2 + This class is a wrapper for OpenGL ES 2 functions. See reference pages on + \l {http://www.khronos.org/opengles/sdk/docs/man/}{khronos.org} for + function documentation. + \sa QAbstractOpenGLFunctions */ diff --git a/util/glgen/codegenerator.cpp b/util/glgen/codegenerator.cpp index c6a77569dcde13726970e65252f3d1d85d6b90dd..693e33cf67ca6ba7cc725e5bc41edee3d202f661 100644 --- a/util/glgen/codegenerator.cpp +++ b/util/glgen/codegenerator.cpp @@ -593,8 +593,27 @@ void CodeGenerator::writePublicClassImplementation(const QString &baseFileName, << QStringLiteral(" \\class ") << className << endl << QStringLiteral(" \\inmodule QtGui") << endl << QStringLiteral(" \\since 5.1") << endl + << QStringLiteral(" \\wrapper") << endl << QStringLiteral(" \\brief The ") << className - << QStringLiteral(" class provides all functions for this version and profile of OpenGL.") << endl << endl + << QString(QStringLiteral(" class provides all functions for OpenGL %1.%2 ")) + .arg(versionProfile.version.major) + .arg(versionProfile.version.minor); + + if (!profileSuffix.isEmpty()) { + profileSuffix.remove(0, 1); + profileSuffix.append(QStringLiteral(" profile")); + } else { + profileSuffix = "specification"; + } + + stream << profileSuffix << QStringLiteral(".") << endl << endl + << QStringLiteral(" This class is a wrapper for functions from ") + << QString(QStringLiteral("OpenGL %1.%2 ")) + .arg(versionProfile.version.major) + .arg(versionProfile.version.minor) + << profileSuffix << QStringLiteral(".") << endl + << QStringLiteral(" See reference pages on \\l {http://www.opengl.org/sdk/docs/}{opengl.org}") << endl + << QStringLiteral(" for function documentation.") << endl << endl << QStringLiteral(" \\sa QAbstractOpenGLFunctions") << endl << QStringLiteral("*/") << endl << endl;