summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-04-21 01:10:22 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-05-01 00:18:05 (GMT)
commit1092ef425b9ed5835e4863c5ec32f9fc21af8d4d (patch)
tree1027d84054d442a511d96fef48f11b5e7e70bc0b
parent6007e3d8ffd8e7c87f67f355ed2b23f98519848e (diff)
downloadQt-1092ef425b9ed5835e4863c5ec32f9fc21af8d4d.zip
Qt-1092ef425b9ed5835e4863c5ec32f9fc21af8d4d.tar.gz
Qt-1092ef425b9ed5835e4863c5ec32f9fc21af8d4d.tar.bz2
qdoc fixes
Reviewed-by: trustme
-rw-r--r--src/opengl/qglshaderprogram.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 2715ed2..d74b930 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -2051,7 +2051,7 @@ void QGLShaderProgram::setUniformValue(const char *name, const QColor& color)
/*!
Sets the uniform variable at \a location in the current context to
- the x() & y() coordinates of \a point.
+ the x and y coordinates of \a point.
\sa setAttributeValue()
*/
@@ -2066,8 +2066,8 @@ void QGLShaderProgram::setUniformValue(int location, const QPoint& point)
/*!
\overload
- Sets the uniform variable at \a location in the current context to
- the x() & y() coordinates of \a point.
+ Sets the uniform variable associated with \a name in the current
+ context to the x and y coordinates of \a point.
\sa setAttributeValue()
*/
@@ -2078,7 +2078,7 @@ void QGLShaderProgram::setUniformValue(const char *name, const QPoint& point)
/*!
Sets the uniform variable at \a location in the current context to
- the x() & y() coordinates of \a point.
+ the x and y coordinates of \a point.
\sa setAttributeValue()
*/
@@ -2093,8 +2093,8 @@ void QGLShaderProgram::setUniformValue(int location, const QPointF& point)
/*!
\overload
- Sets the uniform variable at \a location in the current context to
- the x() & y() coordinates of \a point.
+ Sets the uniform variable associated with \a name in the current
+ context to the x and y coordinates of \a point.
\sa setAttributeValue()
*/
@@ -2105,7 +2105,7 @@ void QGLShaderProgram::setUniformValue(const char *name, const QPointF& point)
/*!
Sets the uniform variable at \a location in the current context to
- the width() & height() of the given \a size.
+ the width and height of the given \a size.
\sa setAttributeValue()
*/
@@ -2120,8 +2120,8 @@ void QGLShaderProgram::setUniformValue(int location, const QSize& size)
/*!
\overload
- Sets the uniform variable at \a location in the current context to
- the width() & height() of the given \a size.
+ Sets the uniform variable associated with \a name in the current
+ context to the width and height of the given \a size.
\sa setAttributeValue()
*/
@@ -2132,7 +2132,7 @@ void QGLShaderProgram::setUniformValue(const char *name, const QSize& size)
/*!
Sets the uniform variable at \a location in the current context to
- the width() & height() of the given \a size.
+ the width and height of the given \a size.
\sa setAttributeValue()
*/
@@ -2147,8 +2147,8 @@ void QGLShaderProgram::setUniformValue(int location, const QSizeF& size)
/*!
\overload
- Sets the uniform variable at \a location in the current context to
- the width() & height() of the given \a size.
+ Sets the uniform variable associated with \a name in the current
+ context to the width and height of the given \a size.
\sa setAttributeValue()
*/