diff options
author | David Boddie <david.boddie@nokia.com> | 2011-04-15 13:35:00 (GMT) |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2011-05-04 17:02:23 (GMT) |
commit | c444fcacd47387af84208fb07b3f71e2f1675e22 (patch) | |
tree | 803d2f1f2c413321050256eb22459caeb648c9f7 /src/opengl | |
parent | 6bac1edefc718771182a3dc6d1fbe0f9349acb21 (diff) | |
download | Qt-c444fcacd47387af84208fb07b3f71e2f1675e22.zip Qt-c444fcacd47387af84208fb07b3f71e2f1675e22.tar.gz Qt-c444fcacd47387af84208fb07b3f71e2f1675e22.tar.bz2 |
Doc: Clarified and tidied up OpenGL overlay color documentation.
Task-number: QTBUG-701
(cherry picked from commit 664408e1046a4d412662b00f5791a9a2b19fde64)
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/qgl.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 057fb55..4587f38 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1993,7 +1993,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}. */ /*! @@ -3266,18 +3266,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. */ |