diff options
author | David Fries <David@Fries.net> | 2013-05-08 00:14:25 -0500 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-15 09:32:58 +0200 |
commit | 3b5173b82635141ae0fc805ecbdbef6194f480be (patch) | |
tree | 0926682d15ff06227d092752083eca1542b25de5 /src/quick/scenegraph | |
parent | 37c476464f6885f09c21f6454072f7dec3011311 (diff) |
Doc: corrections, spelling, and ListView requirements comments
From the ListView comment I thought the model had to be derived from
QAbstractListModel, but that's not the case, QAbstractListModel will
work just fine, it just doesn't support specific cases such as trees.
Change-Id: I59305006540ddc049e276cf412571373cbfa6c67
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/quick/scenegraph')
-rw-r--r-- | src/quick/scenegraph/coreapi/qsggeometry.cpp | 12 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgnode.cpp | 6 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgtexturematerial.cpp | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.cpp b/src/quick/scenegraph/coreapi/qsggeometry.cpp index 818b9b26aa..a82c8570e5 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.cpp +++ b/src/quick/scenegraph/coreapi/qsggeometry.cpp @@ -332,42 +332,42 @@ const QSGGeometry::AttributeSet &QSGGeometry::defaultAttributes_ColoredPoint2D() /*! \fn const QSGGeometry::ColoredPoint2D *QSGGeometry::vertexDataAsColoredPoint2D() const - Convenience function to access the vertex data as an immuatble + Convenience function to access the vertex data as an immutable array of QSGGeometry::ColoredPoint2D. */ /*! \fn QSGGeometry::ColoredPoint2D *QSGGeometry::vertexDataAsColoredPoint2D() - Convenience function to access the vertex data as a muatble + Convenience function to access the vertex data as a mutable array of QSGGeometry::ColoredPoint2D. */ /*! \fn const QSGGeometry::TexturedPoint2D *QSGGeometry::vertexDataAsTexturedPoint2D() const - Convenience function to access the vertex data as an immuatble + Convenience function to access the vertex data as an immutable array of QSGGeometry::TexturedPoint2D. */ /*! \fn QSGGeometry::TexturedPoint2D *QSGGeometry::vertexDataAsTexturedPoint2D() - Convenience function to access the vertex data as a muatble + Convenience function to access the vertex data as a mutable array of QSGGeometry::TexturedPoint2D. */ /*! \fn const QSGGeometry::Point2D *QSGGeometry::vertexDataAsPoint2D() const - Convenience function to access the vertex data as an immuatble + Convenience function to access the vertex data as an immutable array of QSGGeometry::Point2D. */ /*! \fn QSGGeometry::Point2D *QSGGeometry::vertexDataAsPoint2D() - Convenience function to access the vertex data as a muatble + Convenience function to access the vertex data as a mutable array of QSGGeometry::Point2D. */ diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp index 6a22e0e7f9..f30e95deb7 100644 --- a/src/quick/scenegraph/coreapi/qsgnode.cpp +++ b/src/quick/scenegraph/coreapi/qsgnode.cpp @@ -128,12 +128,12 @@ static void qt_print_node_count() before rendering starts. \value OwnsGeometry Only valid for QSGGeometryNode and QSGClipNode. The node has ownership over the QSGGeometry instance and will - delete it when the node is destroyed. + delete it when the node is destroyed or a geometry is assigned. \value OwnsMaterial Only valid for QSGGeometryNode. The node has ownership - over the material and will delete it when the node is destroyed. + over the material and will delete it when the node is destroyed or a material is assigned. \value OwnsOpaqueMaterial Only valid for QSGGeometryNode. The node has ownership over the opaque material and will delete it when the node is - destroyed. + destroyed or a material is assigned. */ /*! diff --git a/src/quick/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp index ff91109a2a..87414766e3 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial.cpp +++ b/src/quick/scenegraph/util/qsgtexturematerial.cpp @@ -145,7 +145,7 @@ void QSGOpaqueTextureMaterialShader::updateState(const RenderState &state, QSGMa tuple. The QSGGeometry::defaultAttributes_TexturedPoint2D returns an attribute set compatible with this material. - The texture to be rendered is can be set using setTexture(). How the + The texture to be rendered can be set using setTexture(). How the texture should be rendered can be specified using setMipmapFiltering(), setFiltering(), setHorizontalWrapMode() and setVerticalWrapMode(). The rendering state is set on the texture instance just before it @@ -208,7 +208,7 @@ QSGMaterialShader *QSGOpaqueTextureMaterial::createShader() const /*! Sets the texture of this material to \a texture. - The material does not take ownership over the texture. + The material does not take ownership of the texture. */ void QSGOpaqueTextureMaterial::setTexture(QSGTexture *texture) @@ -337,7 +337,7 @@ int QSGOpaqueTextureMaterial::compare(const QSGMaterial *o) const tuple. The QSGGeometry::defaultAttributes_TexturedPoint2D returns an attribute set compatible with this material. - The texture to be rendered is set using setTexture(). How the + The texture to be rendered can be set using setTexture(). How the texture should be rendered can be specified using setMipmapFiltering(), setFiltering(), setHorizontalWrapMode() and setVerticalWrapMode(). The rendering state is set on the texture instance just before it |