summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-04-15 13:35:00 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-04-15 13:35:00 (GMT)
commit664408e1046a4d412662b00f5791a9a2b19fde64 (patch)
treecb530ea6cad8ba1142aa49a8842d3098629d8f95
parentc4c813bd982717c643485e22bede84c0997253bb (diff)
downloadQt-664408e1046a4d412662b00f5791a9a2b19fde64.zip
Qt-664408e1046a4d412662b00f5791a9a2b19fde64.tar.gz
Qt-664408e1046a4d412662b00f5791a9a2b19fde64.tar.bz2
Doc: Clarified and tidied up OpenGL overlay color documentation.
Task-number: QTBUG-701
-rw-r--r--src/opengl/qgl.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 19858e7..2b995cc 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1997,7 +1997,7 @@ struct DDSFormat {
If you're using double buffering you can swap the screen contents
with the off-screen buffer using swapBuffers().
- Please note that QGLContext is not thread safe.
+ Please note that QGLContext is not \l{thread-safe}.
*/
/*!
@@ -3270,18 +3270,13 @@ bool QGLContext::areSharing(const QGLContext *context1, const QGLContext *contex
\fn QColor QGLContext::overlayTransparentColor() const
If this context is a valid context in an overlay plane, returns
- the plane's transparent color. Otherwise returns an \link
- QColor::isValid() invalid \endlink color.
-
- The returned color's \link QColor::pixel() pixel \endlink value is
- the index of the transparent color in the colormap of the overlay
- plane. (Naturally, the color's RGB values are meaningless.)
+ the plane's transparent color. Otherwise returns an
+ \{QColor::isValid()}{invalid} color.
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.
*/