diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-23 09:33:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-23 09:33:53 +0200 |
| commit | ec2c6c0f13004bc1bba92f14443228778da287a0 (patch) | |
| tree | 5c4e2621091ad7bbd31e6ffb6a277c1aaee39b55 /src/extras/geometries/qtorusmesh.cpp | |
| parent | 5476bc6b4b6a12c921da502c24c4e078b04dd3b3 (diff) | |
| parent | 0e3d54f8d7f9be26687afebcc9f456e4cefc2357 (diff) | |
Merge remote-tracking branch 'origin/5.8' into devwip/particles
Change-Id: I4e1c528eb8e1c81aead51a5664635ca2becad397
Diffstat (limited to 'src/extras/geometries/qtorusmesh.cpp')
| -rw-r--r-- | src/extras/geometries/qtorusmesh.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/extras/geometries/qtorusmesh.cpp b/src/extras/geometries/qtorusmesh.cpp index e3b5b61d0..a77631b73 100644 --- a/src/extras/geometries/qtorusmesh.cpp +++ b/src/extras/geometries/qtorusmesh.cpp @@ -51,9 +51,9 @@ namespace Qt3DExtras { /*! * \qmltype TorusMesh - * \instantiates Qt3DRender::QTorusMesh - * \inqmlmodule Qt3D.Render - * \brief A custom mesh. + * \instantiates Qt3DExtras::QTorusMesh + * \inqmlmodule Qt3D.Extras + * \brief A toroidal mesh. */ /*! @@ -69,24 +69,24 @@ namespace Qt3DExtras { */ /*! - * \qmlproperty float TorusMesh::radius + * \qmlproperty real TorusMesh::radius * * Holds the outer radius of the torus. */ /*! - * \qmlproperty float TorusMesh::minorRadius + * \qmlproperty real TorusMesh::minorRadius * * Holds the inner radius of the torus. */ /*! - * \class Qt3DRender::QTorusMesh - * \inmodule Qt3DRender + * \class Qt3DExtras::QTorusMesh + * \inmodule Qt3DExtras * * \inherits Qt3DRender::QGeometryRenderer * - * \brief A custom mesh. + * \brief A toroidal mesh. */ /*! |