diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 21:48:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 21:50:16 +0100 |
| commit | a359bd756a98a0462bbd039d9b76981d73dc11f7 (patch) | |
| tree | 4917b25a005e75344a8f9ba60713ef5b4baa3533 /src/input/frontend/qmousecontroller.cpp | |
| parent | 3d30f6151c0c2884b1f15280301e552b5f67949c (diff) | |
| parent | 5a68874f7a2f18070890bec7c3259af94abe320b (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/doc/src/qt3dcollision-module.qdoc
src/render/frontend/qcamera.cpp
src/render/frontend/qcameralens.cpp
Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d
Diffstat (limited to 'src/input/frontend/qmousecontroller.cpp')
| -rw-r--r-- | src/input/frontend/qmousecontroller.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/input/frontend/qmousecontroller.cpp b/src/input/frontend/qmousecontroller.cpp index caa9bb009..71899f303 100644 --- a/src/input/frontend/qmousecontroller.cpp +++ b/src/input/frontend/qmousecontroller.cpp @@ -46,12 +46,21 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { - +/*! \internal */ QMouseControllerPrivate::QMouseControllerPrivate() : QAbstractPhysicalDevicePrivate() , m_sensitivity(0.1f) { } +/*! + * \qmltype MouseController + * \instantiates Qt3DInput::QMouseController + * \inqmlmodule Qt3D.Input + * \since 5.5 + * \brief Delegates mouse events to the attached MouseInput objects. + * \TODO + * \sa MouseInput + */ /*! * \class Qt3DInput::QMouseController |