summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@theqtcompany.com>2016-01-19 09:30:18 +0200
committerPasi Keränen <pasi.keranen@theqtcompany.com>2016-01-19 10:51:18 +0000
commit4aeadb92130ce650bf5f137071d7777783eaa0e8 (patch)
tree55838592f049a5dfd778f09b2a0cc4c5c950d3d2 /src/render
parente2b88264cc623202362bf6221aaa6717c0a57494 (diff)
Fixed some documentation warnings
Change-Id: I5055043641a1916dde47ad614d8ab7a5788fd93b Task-number: QTBUG-46037 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
Diffstat (limited to 'src/render')
-rw-r--r--src/render/defaults/qphongalphamaterial.cpp9
-rw-r--r--src/render/geometry/qabstractbuffer.cpp2
-rw-r--r--src/render/lights/qlight.cpp2
3 files changed, 4 insertions, 9 deletions
diff --git a/src/render/defaults/qphongalphamaterial.cpp b/src/render/defaults/qphongalphamaterial.cpp
index 494c77e1b..a55e13f9b 100644
--- a/src/render/defaults/qphongalphamaterial.cpp
+++ b/src/render/defaults/qphongalphamaterial.cpp
@@ -186,8 +186,7 @@ void QPhongAlphaMaterialPrivate::handleAlphaChanged(const QVariant &var)
\class Qt3DRender::QPhongAlphaMaterial
\brief The QPhongAlphaMaterial class provides a default implementation of
- the phong lighting effect with alpha
-.
+ the phong lighting effect with alpha.
\inmodule Qt3DRenderer
\since 5.5
@@ -207,8 +206,6 @@ void QPhongAlphaMaterialPrivate::handleAlphaChanged(const QVariant &var)
*/
/*!
- \fn Qt3DRender::QPhongAlphaMaterial::QPhongAlphaMaterial(QNode *parent)
-
Constructs a new QPhongAlphaMaterial instance with parent object \a parent.
*/
QPhongAlphaMaterial::QPhongAlphaMaterial(QNode *parent)
@@ -219,8 +216,6 @@ QPhongAlphaMaterial::QPhongAlphaMaterial(QNode *parent)
}
/*!
- \fn Qt3DRender::QPhongAlphaMaterial::~QPhongAlphaMaterial()
-
Destroys the QPhongAlphaMaterial.
*/
QPhongAlphaMaterial::~QPhongAlphaMaterial()
@@ -250,7 +245,7 @@ QColor QPhongAlphaMaterial::diffuse() const
}
/*!
- \property QColor Qt3DRender::QPhongAlphaMaterial::specular
+ \property Qt3DRender::QPhongAlphaMaterial::specular
Holds the specular color.
*/
diff --git a/src/render/geometry/qabstractbuffer.cpp b/src/render/geometry/qabstractbuffer.cpp
index d0ec75451..1d3673c38 100644
--- a/src/render/geometry/qabstractbuffer.cpp
+++ b/src/render/geometry/qabstractbuffer.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
/*!
- \class Qt3DCore::QAbstractBufferPrivate
+ \class Qt3DRender::QAbstractBufferPrivate
\internal
*/
diff --git a/src/render/lights/qlight.cpp b/src/render/lights/qlight.cpp
index 77cf4efe1..ee912ed00 100644
--- a/src/render/lights/qlight.cpp
+++ b/src/render/lights/qlight.cpp
@@ -45,7 +45,7 @@ namespace Qt3DRender
/*!
* \qmltype Light
* \inqmlmodule Qt3D.Render
- * \instantiates QLight
+ * \instantiates Qt3DRender::QLight
* \brief Encapsulate a QLight object in a Qt 3D scene.
* \since 5.6
*/