summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-07-13 13:28:14 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-07-13 13:28:14 (GMT)
commit079a4105aff9c63d4107762aec478ade9900c7c2 (patch)
treee5960fded23f9b26e7b7c045b0086476540b8572 /src/opengl
parent83fa72df1ad059c6284aaf510d381cb7caed966a (diff)
downloadQt-079a4105aff9c63d4107762aec478ade9900c7c2.zip
Qt-079a4105aff9c63d4107762aec478ade9900c7c2.tar.gz
Qt-079a4105aff9c63d4107762aec478ade9900c7c2.tar.bz2
doc: Fixed several qdoc warnings.
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qgl.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index fc28a73..2fa33bf 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1334,6 +1334,10 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co
\value OpenGL_Version_3_2 OpenGL version 3.2 or higher is present.
+ \value OpenGL_Version_3_3 OpenGL version 3.3 or higher is present.
+
+ \value OpenGL_Version_4_0 OpenGL version 4.0 or higher is present.
+
\value OpenGL_ES_CommonLite_Version_1_0 OpenGL ES version 1.0 Common Lite or higher is present.
\value OpenGL_ES_Common_Version_1_0 OpenGL ES version 1.0 Common or higher is present.
@@ -5037,8 +5041,9 @@ void QGLWidget::deleteTexture(QMacCompatGLuint id)
/*!
\since 4.4
- Calls the corresponding QGLContext::drawTexture() on
- this widget's context.
+ Calls the corresponding QGLContext::drawTexture() with
+ \a target, \a textureId, and \a textureTarget for this
+ widget's context.
*/
void QGLWidget::drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget)
{
@@ -5058,8 +5063,9 @@ void QGLWidget::drawTexture(const QRectF &target, QMacCompatGLuint textureId, QM
/*!
\since 4.4
- Calls the corresponding QGLContext::drawTexture() on
- this widget's context.
+ Calls the corresponding QGLContext::drawTexture() with
+ \a point, \a textureId, and \a textureTarget for this
+ widget's context.
*/
void QGLWidget::drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget)
{