From 92a74083f71f3b86589fa24e60d5f5bd6d0b12ad Mon Sep 17 00:00:00 2001 From: Julian de Bhal Date: Wed, 21 Mar 2012 15:02:03 +1000 Subject: Clean up doc errors in the qt4 branch Change-Id: I52eacdbe0e15de7571934b0a6a6609396bda1719 Reviewed-by: Sergey Dubitskiy --- src/imports/shapes/capsulemesh.cpp | 2 +- src/threed/effects/qglshaderprogrameffect.cpp | 7 ++++--- src/threed/scene/qglscenenode.cpp | 11 +++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/imports/shapes/capsulemesh.cpp b/src/imports/shapes/capsulemesh.cpp index a29a539c5..067627b9b 100644 --- a/src/imports/shapes/capsulemesh.cpp +++ b/src/imports/shapes/capsulemesh.cpp @@ -240,7 +240,7 @@ void CapsuleMesh::setLength(qreal length) level of detail as specified in the Cylinder and Sphere objects. - \sa Sphere, Cylinder + \sa SphereMesh, CylinderMesh */ int CapsuleMesh::levelOfDetail() const { diff --git a/src/threed/effects/qglshaderprogrameffect.cpp b/src/threed/effects/qglshaderprogrameffect.cpp index 5efe91e6b..ef51d8abe 100644 --- a/src/threed/effects/qglshaderprogrameffect.cpp +++ b/src/threed/effects/qglshaderprogrameffect.cpp @@ -1002,7 +1002,8 @@ void QGLShaderProgramEffect::setFragmentShader(const QByteArray &source) /*! Sets the type of primitive the program's geometry shader is expecting to - recieve from the vertex shader. The default value is GL_TRIANGLE_STRIP. + recieve from the vertex shader to \a drawingMode. The default value is + GL_TRIANGLE_STRIP. If the program has no geometry shader, this has no effect. */ @@ -1013,8 +1014,8 @@ void QGLShaderProgramEffect::setGeometryInputType(GLenum drawingMode) } /*! - Sets what sort of primitives the program's geometry shader will produce. - The default value is GL_TRIANGLE_STRIP. + Sets what sort of primitives the program's geometry shader will produce + to \a drawingMode. The default value is GL_TRIANGLE_STRIP. If the program has no geometry shader, this has no effect. */ diff --git a/src/threed/scene/qglscenenode.cpp b/src/threed/scene/qglscenenode.cpp index abe3b959d..97e1531b4 100644 --- a/src/threed/scene/qglscenenode.cpp +++ b/src/threed/scene/qglscenenode.cpp @@ -260,6 +260,17 @@ QGLSceneNode::~QGLSceneNode() } } +/*! + \property QGLSceneNode::options + \brief Various option flags effecting rendering + + This property containst several flags that modify normal rendering and + culling on a QGLSceneNode. See \l Options for a full description of the + available flags. + + \sa setOption(), Options +*/ + /*! Returns the drawing options associated with this node. The default is 0 (no options set). -- cgit v1.2.1