aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/util/qsgtexturematerial.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2012-06-04 16:56:17 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-08 11:40:25 +0200
commit1535da8a5923b5829b945cc9fd1dee4cdfbcfe5e (patch)
treee0d7ecfae3b56f1d995a4c1c39bb46bc03d5b529 /src/quick/scenegraph/util/qsgtexturematerial.cpp
parent7775287e40689c6301ddb838b4bcd030b617677c (diff)
Improve on scenegraph documentation.
Change-Id: Ib584a45454f6fd2a3c0bfb32a76b19839e4a2a09 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com> Reviewed-by: Chris Adams <christopher.adams@nokia.com> Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/quick/scenegraph/util/qsgtexturematerial.cpp')
-rw-r--r--src/quick/scenegraph/util/qsgtexturematerial.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp
index 96fc037bfe..7f461bb72d 100644
--- a/src/quick/scenegraph/util/qsgtexturematerial.cpp
+++ b/src/quick/scenegraph/util/qsgtexturematerial.cpp
@@ -164,7 +164,7 @@ void QSGOpaqueTextureMaterialShader::updateState(const RenderState &state, QSGMa
The default mipmap filtering and filtering mode is set to
QSGTexture::Nearest. The default wrap modes is set to
- QSGTexture::ClampToEdge.
+ \c QSGTexture::ClampToEdge.
*/
QSGOpaqueTextureMaterial::QSGOpaqueTextureMaterial()
@@ -236,7 +236,7 @@ void QSGOpaqueTextureMaterial::setTexture(QSGTexture *texture)
Returns this material's mipmap filtering mode.
- The default mipmap mode is QSGTexture::Nearest.
+ The default mipmap mode is \c QSGTexture::Nearest.
*/
@@ -253,17 +253,17 @@ void QSGOpaqueTextureMaterial::setTexture(QSGTexture *texture)
/*!
- \fn QSGTexture::Filtering filtering() const
+ \fn QSGTexture::Filtering QSGOpaqueTextureMaterial::filtering() const
Returns this material's filtering mode.
- The default filtering is QSGTexture::Nearest.
+ The default filtering is \c QSGTexture::Nearest.
*/
/*!
- \fn void setHorizontalWrapMode(QSGTexture::WrapMode mode)
+ \fn void QSGOpaqueTextureMaterial::setHorizontalWrapMode(QSGTexture::WrapMode mode)
Sets the horizontal wrap mode to \a mode.
@@ -274,17 +274,17 @@ void QSGOpaqueTextureMaterial::setTexture(QSGTexture *texture)
/*!
- \fn QSGTexture::WrapMode horizontalWrapMode() const
+ \fn QSGTexture::WrapMode QSGOpaqueTextureMaterial::horizontalWrapMode() const
Returns this material's horizontal wrap mode.
- The default horizontal wrap mode is QSGTexutre::ClampToEdge
+ The default horizontal wrap mode is \c QSGTexutre::ClampToEdge.
*/
/*!
- \fn void setVerticalWrapMode(QSGTexture::WrapMode mode)
+ \fn void QSGOpaqueTextureMaterial::setVerticalWrapMode(QSGTexture::WrapMode mode)
Sets the vertical wrap mode to \a mode.
@@ -295,11 +295,11 @@ void QSGOpaqueTextureMaterial::setTexture(QSGTexture *texture)
/*!
- \fn QSGTexture::WrapMode verticalWrapMode() const
+ \fn QSGTexture::WrapMode QSGOpaqueTextureMaterial::verticalWrapMode() const
Returns this material's vertical wrap mode.
- The default vertical wrap mode is QSGTexutre::ClampToEdge
+ The default vertical wrap mode is \c QSGTexutre::ClampToEdge.
*/