diff options
| author | Julian de Bhal <julian.debhal@nokia.com> | 2012-03-21 15:02:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-05 03:02:47 +0200 |
| commit | 92a74083f71f3b86589fa24e60d5f5bd6d0b12ad (patch) | |
| tree | cd477a003da920df5eba5a12a1e32b2e5a85f889 | |
| parent | 728463afce4473a9f4c11ab37c924c1e8d482fbc (diff) | |
| download | qt3d-1_0_RC1.tar.gz | |
Clean up doc errors in the qt4 branch1_0_RC1
Change-Id: I52eacdbe0e15de7571934b0a6a6609396bda1719
Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
| -rw-r--r-- | src/imports/shapes/capsulemesh.cpp | 2 | ||||
| -rw-r--r-- | src/threed/effects/qglshaderprogrameffect.cpp | 7 | ||||
| -rw-r--r-- | 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 @@ -261,6 +261,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). |