summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qgl.cpp16
-rw-r--r--src/opengl/qglframebufferobject.cpp2
-rw-r--r--src/opengl/qglpixelbuffer.cpp2
3 files changed, 2 insertions, 18 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 1ca9f83501..10ba8ac2ee 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -219,8 +219,6 @@ QGLSignalProxy *QGLSignalProxy::instance()
\value NoDeprecatedFunctions Disables the use of deprecated functionality for OpenGL 3.x
contexts. A context with deprecated functionality disabled is
called a forward compatible context in the OpenGL specification.
-
- \sa {Sample Buffers Example}
*/
/*****************************************************************************
@@ -3276,8 +3274,7 @@ uint QGLContext::colorIndex(const QColor&) const
The returned QColor object will generally work as expected only
when passed as the argument to QGLWidget::qglColor() or
QGLWidget::qglClearColor(). Under certain circumstances it can
- also be used to draw transparent graphics with a QPainter. See the
- examples/opengl/overlay_x11 example for details.
+ also be used to draw transparent graphics with a QPainter.
*/
QColor QGLContext::overlayTransparentColor() const
{
@@ -3717,10 +3714,6 @@ void QGLContext::doneCurrent()
\li Call QPainter::end() to finish painting.
\endlist
- Overpainting 2D content on top of 3D content takes a little more effort.
- One approach to doing this is shown in the
- \l{Overpainting Example}{Overpainting} example.
-
\section1 Threading
As of Qt version 4.8, support for doing threaded GL rendering has
@@ -3814,8 +3807,7 @@ void QGLContext::doneCurrent()
\e{OpenGL is a trademark of Silicon Graphics, Inc. in the United States and other
countries.}
- \sa QOpenGLWidget, QGLPixelBuffer, {Hello GL Example}, {2D Painting Example}, {Overpainting Example},
- {Grabber Example}
+ \sa QOpenGLWidget, QGLPixelBuffer
*/
/*!
@@ -4776,8 +4768,6 @@ static void qt_gl_draw_text(QPainter *p, int x, int y, const QString &str,
\note This function can only be used inside a
QPainter::beginNativePainting()/QPainter::endNativePainting() block
if a painter is active on the QGLWidget.
-
- \l{Overpainting Example}{Overpaint} with QPainter::drawText() instead.
*/
void QGLWidget::renderText(int x, int y, const QString &str, const QFont &font)
@@ -4868,8 +4858,6 @@ void QGLWidget::renderText(int x, int y, const QString &str, const QFont &font)
\note This function can only be used inside a
QPainter::beginNativePainting()/QPainter::endNativePainting() block
if a painter is active on the QGLWidget.
-
- \l{Overpainting Example}{Overpaint} with QPainter::drawText() instead.
*/
void QGLWidget::renderText(double x, double y, double z, const QString &str, const QFont &font)
{
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index 57498f8929..f6e7a9a308 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -796,8 +796,6 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz,
OpenGL ES 2.0 is required for this to work.
\note This class has been deprecated in favor of QOpenGLFramebufferObject.
-
- \sa {Framebuffer Object 2 Example}
*/
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp
index 4205761472..4a32a99912 100644
--- a/src/opengl/qglpixelbuffer.cpp
+++ b/src/opengl/qglpixelbuffer.cpp
@@ -89,8 +89,6 @@
Pbuffers are provided by the OpenGL \c pbuffer extension; call
hasOpenGLPbuffer() to find out if the system provides pbuffers.
-
- \sa {Pixel Buffers Example}
*/
#include <private/qopenglextensions_p.h>