From: Samuel Rødal Date: Fri, 2 Sep 2011 10:32:20 +0000 (+0200) Subject: Fix the \since 4.x tags in gui/opengl. X-Git-Tag: qt-v5.0.0-alpha1~3626^2~81 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61fa9ec8a1044a57b21689ee45c2377b0209fc56;p=profile%2Fivi%2Fqtbase.git Fix the \since 4.x tags in gui/opengl. All this API is "new" since 5.0. Change-Id: I7ba1718a4a24eac00ccc4db1646200e9544ee5a4 Reviewed-on: http://codereview.qt.nokia.com/4131 Reviewed-by: Qt Sanity Bot Reviewed-by: Gunnar Sletta --- diff --git a/src/gui/opengl/qopenglbuffer.cpp b/src/gui/opengl/qopenglbuffer.cpp index 4da0942..bdd3801 100644 --- a/src/gui/opengl/qopenglbuffer.cpp +++ b/src/gui/opengl/qopenglbuffer.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE /*! \class QOpenGLBuffer \brief The QOpenGLBuffer class provides functions for creating and managing GL buffer objects. - \since 4.7 + \since 5.0 \ingroup painting-3D Buffer objects are created in the GL server so that the diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp index 2e9f3a1..51d6f7e 100644 --- a/src/gui/opengl/qopenglframebufferobject.cpp +++ b/src/gui/opengl/qopenglframebufferobject.cpp @@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE \brief The QOpenGLFramebufferObjectFormat class specifies the format of an OpenGL framebuffer object. - \since 4.6 + \since 5.0 \ingroup painting-3D @@ -194,8 +194,6 @@ int QOpenGLFramebufferObjectFormat::samples() const } /*! - \since 4.8 - Enables mipmapping if \a enabled is true; otherwise disables it. Mipmapping is disabled by default. @@ -214,8 +212,6 @@ void QOpenGLFramebufferObjectFormat::setMipmap(bool enabled) } /*! - \since 4.8 - Returns true if mipmapping is enabled. \sa setMipmap() @@ -657,7 +653,7 @@ void QOpenGLFramebufferObjectPrivate::init(QOpenGLFramebufferObject *q, const QS /*! \class QOpenGLFramebufferObject \brief The QOpenGLFramebufferObject class encapsulates an OpenGL framebuffer object. - \since 4.2 + \since 5.0 \ingroup painting-3D @@ -736,7 +732,6 @@ void QOpenGLFramebufferObjectPrivate::init(QOpenGLFramebufferObject *q, const QS /*! \enum QOpenGLFramebufferObject::Attachment - \since 4.3 This enum type is used to configure the depth and stencil buffers attached to the framebuffer object when it is created. @@ -1244,8 +1239,6 @@ QOpenGLFramebufferObject::Attachment QOpenGLFramebufferObject::attachment() cons } /*! - \since 4.5 - Returns true if the framebuffer object is currently bound to a context, otherwise false is returned. */ @@ -1260,8 +1253,6 @@ bool QOpenGLFramebufferObject::isBound() const /*! \fn bool QOpenGLFramebufferObject::hasOpenGLFramebufferBlit() - \since 4.6 - Returns true if the OpenGL \c{GL_EXT_framebuffer_blit} extension is present on this system; otherwise returns false. @@ -1273,8 +1264,6 @@ bool QOpenGLFramebufferObject::hasOpenGLFramebufferBlit() } /*! - \since 4.6 - Blits from the \a sourceRect rectangle in the \a source framebuffer object to the \a targetRect rectangle in the \a target framebuffer object. diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp index 3947df4..8396a0e 100644 --- a/src/gui/opengl/qopenglfunctions.cpp +++ b/src/gui/opengl/qopenglfunctions.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE /*! \class QOpenGLFunctions \brief The QOpenGLFunctions class provides cross-platform access to the OpenGL/ES 2.0 API. - \since 4.8 + \since 5.0 \ingroup painting-3D OpenGL/ES 2.0 defines a subset of the OpenGL specification that is diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp index 715b6ea..aa7767a 100644 --- a/src/gui/opengl/qopenglshaderprogram.cpp +++ b/src/gui/opengl/qopenglshaderprogram.cpp @@ -125,7 +125,7 @@ QT_BEGIN_NAMESPACE /*! \class QOpenGLShader \brief The QOpenGLShader class allows OpenGL shaders to be compiled. - \since 4.6 + \since 5.0 \ingroup painting-3D This class supports shaders written in the OpenGL Shading Language (GLSL) @@ -1407,7 +1407,6 @@ void QOpenGLShaderProgram::setAttributeArray \sa setAttributeValue(), setUniformValue(), enableAttributeArray() \sa disableAttributeArray(), setAttributeBuffer() - \since 4.7 */ void QOpenGLShaderProgram::setAttributeArray (int location, GLenum type, const void *values, int tupleSize, int stride) @@ -1526,7 +1525,6 @@ void QOpenGLShaderProgram::setAttributeArray \sa setAttributeValue(), setUniformValue(), enableAttributeArray() \sa disableAttributeArray(), setAttributeBuffer() - \since 4.7 */ void QOpenGLShaderProgram::setAttributeArray (const char *name, GLenum type, const void *values, int tupleSize, int stride) @@ -1551,7 +1549,6 @@ void QOpenGLShaderProgram::setAttributeArray setAttributeValue() for \a location will be used. \sa setAttributeArray() - \since 4.7 */ void QOpenGLShaderProgram::setAttributeBuffer (int location, GLenum type, int offset, int tupleSize, int stride) @@ -1583,7 +1580,6 @@ void QOpenGLShaderProgram::setAttributeBuffer setAttributeValue() for \a name will be used. \sa setAttributeArray() - \since 4.7 */ void QOpenGLShaderProgram::setAttributeBuffer (const char *name, GLenum type, int offset, int tupleSize, int stride) @@ -2370,7 +2366,6 @@ void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix4x4& v in column-major order. \sa setAttributeValue() - \since 4.7 */ void QOpenGLShaderProgram::setUniformValue(int location, const GLfloat value[2][2]) { @@ -2388,7 +2383,6 @@ void QOpenGLShaderProgram::setUniformValue(int location, const GLfloat value[2][ in column-major order. \sa setAttributeValue() - \since 4.7 */ void QOpenGLShaderProgram::setUniformValue(int location, const GLfloat value[3][3]) { @@ -2424,7 +2418,6 @@ void QOpenGLShaderProgram::setUniformValue(int location, const GLfloat value[4][ in column-major order. \sa setAttributeValue() - \since 4.7 */ void QOpenGLShaderProgram::setUniformValue(const char *name, const GLfloat value[2][2]) { @@ -2439,7 +2432,6 @@ void QOpenGLShaderProgram::setUniformValue(const char *name, const GLfloat value in column-major order. \sa setAttributeValue() - \since 4.7 */ void QOpenGLShaderProgram::setUniformValue(const char *name, const GLfloat value[3][3]) { @@ -2963,8 +2955,6 @@ void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4 Returns the hardware limit for how many vertices a geometry shader can output. - \since 4.7 - \sa setGeometryOutputVertexCount() */ int QOpenGLShaderProgram::maxGeometryOutputVertices() const @@ -2978,8 +2968,6 @@ int QOpenGLShaderProgram::maxGeometryOutputVertices() const Sets the maximum number of vertices the current geometry shader program will produce, if active, to \a count. - \since 4.7 - This parameter takes effect the next time the program is linked. */ void QOpenGLShaderProgram::setGeometryOutputVertexCount(int count) @@ -2999,8 +2987,6 @@ void QOpenGLShaderProgram::setGeometryOutputVertexCount(int count) Returns the maximum number of vertices the current geometry shader program will produce, if active. - \since 4.7 - This parameter takes effect the ntext time the program is linked. */ int QOpenGLShaderProgram::geometryOutputVertexCount() const @@ -3024,8 +3010,6 @@ void QOpenGLShaderProgram::setGeometryInputType(GLenum inputType) Returns the geometry shader input type, if active. This parameter takes effect the next time the program is linked. - - \since 4.7 */ GLenum QOpenGLShaderProgram::geometryInputType() const @@ -3039,8 +3023,6 @@ GLenum QOpenGLShaderProgram::geometryInputType() const \a outputType. This parameter takes effect the next time the program is linked. - - \since 4.7 */ void QOpenGLShaderProgram::setGeometryOutputType(GLenum outputType) { @@ -3052,8 +3034,6 @@ void QOpenGLShaderProgram::setGeometryOutputType(GLenum outputType) Returns the geometry shader output type, if active. This parameter takes effect the next time the program is linked. - - \since 4.7 */ GLenum QOpenGLShaderProgram::geometryOutputType() const { @@ -3099,8 +3079,6 @@ void QOpenGLShaderProgram::shaderDestroyed() The \a context is used to resolve the GLSL extensions. If \a context is null, then QOpenGLContext::currentContext() is used. - - \since 4.7 */ bool QOpenGLShader::hasOpenGLShaders(ShaderType type, QOpenGLContext *context) {