diff options
| author | Nico Vertriest <nico.vertriest@qt.io> | 2016-10-26 13:20:40 +0200 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@qt.io> | 2017-01-25 14:23:04 +0000 |
| commit | 40f60c66ab538229f4f64ea8f56682ae33c5926c (patch) | |
| tree | 1023883ee54bff312f51502d417c184f663d878a | |
| parent | eecf5f7d7df3ec9fde757389d0ab18a63bcf09b0 (diff) | |
Doc: corrected several qdoc errors qt3d
qaxisaccumulator.cpp:182: warning: QML property documented multiple times: 'real Qt3D.Input::AxisAccumulator::value'
Errors on \return
Change-Id: Ibff02113e1a4ac3cfc79d23960812345cba513cb
Reviewed-by: Martin Smith <martin.smith@qt.io>
| -rw-r--r-- | src/input/frontend/qaxisaccumulator.cpp | 14 | ||||
| -rw-r--r-- | src/render/picking/qpicktriangleevent.cpp | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/input/frontend/qaxisaccumulator.cpp b/src/input/frontend/qaxisaccumulator.cpp index b13a18167..b9a5add35 100644 --- a/src/input/frontend/qaxisaccumulator.cpp +++ b/src/input/frontend/qaxisaccumulator.cpp @@ -183,11 +183,13 @@ QAxisAccumulator::SourceAxisType QAxisAccumulator::sourceAxisType() const /*! \qmlproperty real Qt3D.Input::AxisAccumulator::value - The accumulated (integrated) value. + The amount to scale the axis value by when accumulating. This can be + thought of as the maximum velocity or acceleration the axis can + control. */ /*! - \return the accumulated (integrated) value. + Returns the accumulated (integrated) value. */ float QAxisAccumulator::value() const { @@ -208,14 +210,6 @@ float QAxisAccumulator::velocity() const } /*! - \qmlproperty real Qt3D.Input::AxisAccumulator::value - - The amount to scale the axis value by when accumulating. This can be - thought of as the maximum velocity or acceleration the axis can - control. - */ - -/*! The amount to scale the axis value by when accumulating. This can be thought of as the maximum velocity or acceleration the axis can control. diff --git a/src/render/picking/qpicktriangleevent.cpp b/src/render/picking/qpicktriangleevent.cpp index ae96d5d2b..a1da8b975 100644 --- a/src/render/picking/qpicktriangleevent.cpp +++ b/src/render/picking/qpicktriangleevent.cpp @@ -204,7 +204,7 @@ uint QPickTriangleEvent::vertex2Index() const */ /*! * \brief QPickTriangleEvent::vertex3Index - * \returns index of third point of picked triangle + * Returns index of third point of picked triangle */ uint QPickTriangleEvent::vertex3Index() const { |