summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@digia.com>2012-11-27 14:49:39 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-27 15:41:45 +0100
commit11a38b63bd34b632e335a38f2e671bea0d6a9564 (patch)
tree850321b9a67b47b214f27cc8ce2448a4fdda9d27 /src/opengl
parentc0bf2884f99095a54af2e230636fdf55910055bd (diff)
Properly deprecated QGLFramebufferObject and QGLFramebufferObjectFormat
Change-Id: I9affdcce0988e3538c8a7a696999a7cf8c3448aa Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qglframebufferobject.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index efc6690db6..5f351366be 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -126,7 +126,7 @@ 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.
+ \note This class has been deprecated in favor of QOpenGLFramebufferObjectFormat.
\sa QGLFramebufferObject
*/
@@ -703,6 +703,8 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz,
\brief The QGLFramebufferObject class encapsulates an OpenGL framebuffer object.
\since 4.2
+ \obsolete
+
\ingroup painting-3D
The QGLFramebufferObject class encapsulates an OpenGL framebuffer
@@ -774,6 +776,8 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz,
using a QPainter in a separate thread. Note that OpenGL 2.0 or
OpenGL ES 2.0 is required for this to work.
+ \note This class has been deprecated in favor of QOpenGLFramebufferObject.
+
\sa {Framebuffer Object Example}
*/