diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:08:17 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:12:27 +0200 |
commit | e7b022ec334ce6768c30402c1e17fe0a1e3a0bb0 (patch) | |
tree | 72641f2dc53522ca1959ac8c1d06692303c3a17b /src/datavisualization/input/qabstract3dinputhandler.cpp | |
parent | 5adf257bebf2df7f54b92fb724cd547dc58a1163 (diff) | |
parent | 73ec35fa12a4b150670ea93d3021ca8e658063e1 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ibb41c2bb83df7e02696e27afe62e94ed059284ae
Diffstat (limited to 'src/datavisualization/input/qabstract3dinputhandler.cpp')
-rw-r--r-- | src/datavisualization/input/qabstract3dinputhandler.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index 2f4629ae..d0ab00a1 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -148,8 +148,14 @@ void QAbstract3DInputHandler::wheelEvent(QWheelEvent *event) /*! * \property QAbstract3DInputHandler::inputView * - * Current enumerated input view based on the view of the processed input events. - * When the view changes \c inputViewChanged signal is emitted. + * \brief The current enumerated input view based on the view of the processed + * input events. + * + * One of the InputView enum values. + * + * When the view changes, the \c inputViewChanged signal is emitted. + * + * \sa InputView */ QAbstract3DInputHandler::InputView QAbstract3DInputHandler::inputView() const { @@ -167,7 +173,7 @@ void QAbstract3DInputHandler::setInputView(InputView inputView) /*! * \property QAbstract3DInputHandler::inputPosition * - * Last input position based on the processed input events. + * \brief The last input position based on the processed input events. */ QPoint QAbstract3DInputHandler::inputPosition() const { @@ -183,7 +189,7 @@ void QAbstract3DInputHandler::setInputPosition(const QPoint &position) } /*! - * \return the manhattan length between last two input positions. + * Returns the manhattan length between last two input positions. */ int QAbstract3DInputHandler::prevDistance() const { @@ -201,9 +207,10 @@ void QAbstract3DInputHandler::setPrevDistance(int distance) /*! * \property QAbstract3DInputHandler::scene * - * The 3D scene this abstract input handler is controlling. Only one scene can - * be controlled by one input handler. Setting a \a scene to an input handler doesn't - * transfer the ownership of the \a scene. + * \brief The 3D scene this abstract input handler is controlling. + * + * One input handler can control one scene. Setting a scene to an input handler + * does not transfer the ownership of the scene. */ Q3DScene *QAbstract3DInputHandler::scene() const { @@ -228,7 +235,6 @@ void QAbstract3DInputHandler::setPreviousInputPos(const QPoint &position) /*! * Returns the previous input position. - * \return Previous input position. */ QPoint QAbstract3DInputHandler::previousInputPos() const { |