diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
| commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
| tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /src/opengl/qglpixelbuffer.cpp | |
| parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
| parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'src/opengl/qglpixelbuffer.cpp')
| -rw-r--r-- | src/opengl/qglpixelbuffer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp index e5e7de0fff9..bcb2dd53db8 100644 --- a/src/opengl/qglpixelbuffer.cpp +++ b/src/opengl/qglpixelbuffer.cpp @@ -213,7 +213,7 @@ QGLPixelBuffer::~QGLPixelBuffer() /*! \fn bool QGLPixelBuffer::makeCurrent() Makes this pbuffer the current OpenGL rendering context. Returns - true on success; otherwise returns false. + true on success; otherwise returns \c false. \sa QGLContext::makeCurrent(), doneCurrent() */ @@ -242,8 +242,8 @@ bool QGLPixelBuffer::makeCurrent() /*! \fn bool QGLPixelBuffer::doneCurrent() - Makes no context the current OpenGL context. Returns true on - success; otherwise returns false. + Makes no context the current OpenGL context. Returns \c true on + success; otherwise returns \c false. */ bool QGLPixelBuffer::doneCurrent() @@ -278,7 +278,7 @@ QGLContext *QGLPixelBuffer::context() const /*! \fn bool QGLPixelBuffer::bindToDynamicTexture(GLuint texture_id) Binds the texture specified by \a texture_id to this pbuffer. - Returns true on success; otherwise returns false. + Returns \c true on success; otherwise returns \c false. The texture must be of the same size and format as the pbuffer. @@ -312,8 +312,8 @@ QGLContext *QGLPixelBuffer::context() const /*! \fn bool QGLPixelBuffer::hasOpenGLPbuffers() - Returns true if the OpenGL \c pbuffer extension is present on - this system; otherwise returns false. + Returns \c true if the OpenGL \c pbuffer extension is present on + this system; otherwise returns \c false. */ /*! @@ -406,7 +406,7 @@ Qt::HANDLE QGLPixelBuffer::handle() const } /*! - Returns true if this pbuffer is valid; otherwise returns false. + Returns \c true if this pbuffer is valid; otherwise returns \c false. */ bool QGLPixelBuffer::isValid() const { |