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>
bb10
Samuel Rødal 2012-09-14 10:47:57 +02:00 committed by Qt by Nokia
parent 6a15a784f4
commit d086c2abaf
6 changed files with 19 additions and 0 deletions

View File

@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE
\class QGLBuffer
\brief The QGLBuffer class provides functions for creating and managing GL buffer objects.
\since 4.7
\obsolete
\ingroup painting-3D
Buffer objects are created in the GL server so that the
@ -70,6 +71,8 @@ QT_BEGIN_NAMESPACE
QGLBuffer performs a shallow copy when objects are copied in this
manner, but does not implement copy-on-write semantics. The original
object will be affected whenever the copy is modified.
\note This class has been deprecated in favor of QOpenGLBuffer.
*/
/*!

View File

@ -44,6 +44,7 @@
\brief The QGLColormap class is used for installing custom colormaps into
a QGLWidget.
\obsolete
\inmodule OpenGL
\ingroup painting-3D
\ingroup shared

View File

@ -108,6 +108,7 @@ extern QImage qt_gl_read_framebuffer(const QSize&, bool, bool);
framebuffer object.
\since 4.6
\obsolete
\ingroup painting-3D
@ -124,6 +125,8 @@ extern QImage qt_gl_read_framebuffer(const QSize&, bool, bool);
after creating a QGLFramebufferObject to find the exact format that was
used to create the frame buffer object.
\note This class has been deprecated in favor of QOpenGLFramebufferObject.
\sa QGLFramebufferObject
*/

View File

@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
\class QGLFunctions
\brief The QGLFunctions class provides cross-platform access to the OpenGL/ES 2.0 API.
\since 4.8
\obsolete
\ingroup painting-3D
OpenGL/ES 2.0 defines a subset of the OpenGL specification that is
@ -117,6 +118,8 @@ QT_BEGIN_NAMESPACE
QGLFunctions funcs(QGLContext::currentContext());
bool npot = funcs.hasOpenGLFeature(QGLFunctions::NPOTTextures);
\endcode
\note This class has been deprecated in favor of QOpenGLFunctions.
*/
/*!

View File

@ -43,6 +43,7 @@
\class QGLPixelBuffer
\brief The QGLPixelBuffer class encapsulates an OpenGL pbuffer.
\since 4.1
\obsolete
\ingroup painting-3D
@ -76,6 +77,8 @@
\endlist
\note This class has been deprecated, use QOpenGLFramebufferObject
for offscreen rendering.
\section1 Threading

View File

@ -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
*/