diff options
| author | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-10-01 11:53:47 (GMT) |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-10-01 11:54:20 (GMT) |
| commit | 25a0a22533f593ed1a91567be3f74ed8b48e7717 (patch) | |
| tree | 30498d72b22f4c0eaaf2dfb15346d6c662aa8b39 | |
| parent | 7878afcb88ad723550b56a796ee4070025bf92f9 (diff) | |
| download | Qt-25a0a22533f593ed1a91567be3f74ed8b48e7717.zip Qt-25a0a22533f593ed1a91567be3f74ed8b48e7717.tar.gz Qt-25a0a22533f593ed1a91567be3f74ed8b48e7717.tar.bz2 | |
Doc: Mark new overloads with \since 4.6.
| -rw-r--r-- | src/opengl/qgl.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index bfb004e..665290c 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1718,7 +1718,7 @@ Q_OPENGL_EXPORT QGLShareRegister* qgl_share_reg() the top left corner. Inverting the texture implies a deep copy prior to upload. - \value MipmapBindOption Specifies that bindTexture should try + \value MipmapBindOption Specifies that bindTexture() should try to generate mipmaps. If the GL implementation supports the \c GL_SGIS_generate_mipmap extension, mipmaps will be automatically generated for the texture. Mipmap generation is only supported for @@ -2361,6 +2361,8 @@ GLuint QGLContext::bindTexture(const QImage &image, GLenum target, GLint format) } /*! + \since 4.6 + Generates and binds a 2D GL texture to the current context, based on \a image. The generated texture id is returned and can be used in later \c glBindTexture() calls. @@ -2422,6 +2424,7 @@ GLuint QGLContext::bindTexture(const QPixmap &pixmap, GLenum target, GLint forma /*! \overload + \since 4.6 Generates and binds a 2D GL texture to the current context, based on \a pixmap. @@ -4503,6 +4506,7 @@ GLuint QGLWidget::bindTexture(const QImage &image, GLenum target, GLint format) /*! \overload + \since 4.6 The binding \a options are a set of options used to decide how to bind the texture to the context. @@ -4544,6 +4548,7 @@ GLuint QGLWidget::bindTexture(const QPixmap &pixmap, GLenum target, GLint format /*! \overload + \since 4.6 Generates and binds a 2D GL texture to the current context, based on \a pixmap. The generated texture id is returned and can be used in |