diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2012-09-14 10:47:57 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-14 11:46:39 +0200 |
commit | d086c2abafdd0dde1a2b05635cb3c3db26ab8969 (patch) | |
tree | 1697359679bff4f582df19311859dd98bc5dbc1d /src/opengl/qglshaderprogram.cpp | |
parent | 6a15a784f494ffa19eb08bad72328302f61c3499 (diff) |
Documented QtOpenGL classes that have better replacements as obsolete.
These have new replacements in QtGui since Qt 5.0.
Change-Id: I20e8fdd4e9c14d8c626eda3072217af1858bf492
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/opengl/qglshaderprogram.cpp')
-rw-r--r-- | src/opengl/qglshaderprogram.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index 1062669b52..8d86f8de03 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE \class QGLShaderProgram \brief The QGLShaderProgram class allows OpenGL shader programs to be linked and used. \since 4.6 + \obsolete \ingroup painting-3D \section1 Introduction @@ -117,6 +118,8 @@ QT_BEGIN_NAMESPACE specified and linked, allowing other operations to be performed on the shader program. + \note This class has been deprecated in favor of QOpenGLShaderProgram. + \sa QGLShader */ @@ -124,6 +127,7 @@ QT_BEGIN_NAMESPACE \class QGLShader \brief The QGLShader class allows OpenGL shaders to be compiled. \since 4.6 + \obsolete \ingroup painting-3D This class supports shaders written in the OpenGL Shading Language (GLSL) @@ -132,6 +136,8 @@ QT_BEGIN_NAMESPACE QGLShader and QGLShaderProgram shelter the programmer from the details of compiling and linking vertex and fragment shaders. + \note This class has been deprecated in favor of QOpenGLShader. + \sa QGLShaderProgram */ |