From 11a38b63bd34b632e335a38f2e671bea0d6a9564 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Samuel=20R=C3=B8dal?= Date: Tue, 27 Nov 2012 14:49:39 +0100 Subject: [PATCH] Properly deprecated QGLFramebufferObject and QGLFramebufferObjectFormat MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I9affdcce0988e3538c8a7a696999a7cf8c3448aa Reviewed-by: Jan Arve Sæther Reviewed-by: Lars Knoll --- src/opengl/qglframebufferobject.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index efc6690..5f35136 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} */ -- 2.7.4