aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/util/qsgflatcolormaterial.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/qsgflatcolormaterial.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/qsgflatcolormaterial.cpp')
-rw-r--r--src/quick/scenegraph/util/qsgflatcolormaterial.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
index 50c8d1661e..8a4ce6db41 100644
--- a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
+++ b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
@@ -119,6 +119,7 @@ const char *FlatColorMaterialShader::fragmentShader() const {
/*!
\class QSGFlatColorMaterial
+
\brief The QSGFlatColorMaterial class provides a convenient way of rendering
solid colored geometry in the scene graph.
@@ -133,7 +134,7 @@ const char *FlatColorMaterialShader::fragmentShader() const {
set compatible with this material.
The flat color material respects both current opacity and current matrix
- when updating it's rendering state.
+ when updating its rendering state.
*/
@@ -150,7 +151,7 @@ QSGFlatColorMaterial::QSGFlatColorMaterial() : m_color(QColor(255, 255, 255))
/*!
- \fn QColor QSGFlatColorMaterial::color() const
+ \fn const QColor &QSGFlatColorMaterial::color() const
Returns this flat color material's color.
@@ -192,6 +193,10 @@ QSGMaterialShader *QSGFlatColorMaterial::createShader() const
}
+/*!
+ \internal
+ */
+
int QSGFlatColorMaterial::compare(const QSGMaterial *other) const
{
const QSGFlatColorMaterial *flat = static_cast<const QSGFlatColorMaterial *>(other);