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

14 files changed, 183 insertions, 16 deletions

diff --git a/src/input/frontend/qabstractphysicaldevice.cpp b/src/input/frontend/qabstractphysicaldevice.cpp
index f12f787b7..74f25d4fa 100644
--- a/src/input/frontend/qabstractphysicaldevice.cpp
+++ b/src/input/frontend/qabstractphysicaldevice.cpp
@@ -46,11 +46,28 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
 
+/*! \internal */
 QAbstractPhysicalDevicePrivate::QAbstractPhysicalDevicePrivate()
     : m_axisSettings()
 {
 }
 
+/*!
+ * \qmltype AbstractPhysicalDevice
+ * \instantiates Qt3DInput::QAbstractPhysicalDevice
+ * \inqmlmodule Qt3D.Input
+ * \since 5.6
+ * \TODO
+ *
+ */
+
+/*!
+ * \class Qt3DInput::QAbstractPhysicalDevice
+ * \inmodule Qt3DInput
+ * \since 5.6
+ * \TODO
+ *
+ */
 QAbstractPhysicalDevice::QAbstractPhysicalDevice(Qt3DCore::QNode *parent)
     : Qt3DCore::QNode(*new QAbstractPhysicalDevicePrivate, parent)
 {
diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp
index c31030086..32aed0225 100644
--- a/src/input/frontend/qaction.cpp
+++ b/src/input/frontend/qaction.cpp
@@ -57,6 +57,22 @@ public:
     QVector<QAbstractActionInput *> m_inputs;
 };
 
+/*!
+ * \qmltype Action
+ * \inqmlmodule Qt3D.Input
+ * \since 5.6
+ * \TODO
+ *
+ */
+
+/*!
+ * \class Qt3DInput::QAction
+ * \inmodule Qt3DInput
+ * \since 5.6
+ * \TODO
+ *
+ */
+
 QAction::QAction(Qt3DCore::QNode *parent)
     : Qt3DCore::QNode(*new QActionPrivate(), parent)
 {
diff --git a/src/input/frontend/qactioninput.cpp b/src/input/frontend/qactioninput.cpp
index 3a1a9cacb..6fd520669 100644
--- a/src/input/frontend/qactioninput.cpp
+++ b/src/input/frontend/qactioninput.cpp
@@ -57,6 +57,23 @@ public:
     QAbstractPhysicalDevice *m_sourceDevice;
 };
 
+/*!
+ * \qmltype ActionInput
+ * \instantiates Qt3DInput::QActionInput
+ * \inqmlmodule Qt3D.Input
+ * \since 5.5
+ * \TODO
+ *
+ */
+
+/*!
+ * \class Qt3DInput::QActionInput
+ * \inmodule Qt3DInput
+ * \since 5.5
+ * \TODO
+ *
+ */
+
 QActionInput::QActionInput(Qt3DCore::QNode *parent)
     : Qt3DInput::QAbstractActionInput(*new QActionInputPrivate(), parent)
 {
diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp
index 819a8ecca..b463f041e 100644
--- a/src/input/frontend/qaxis.cpp
+++ b/src/input/frontend/qaxis.cpp
@@ -56,6 +56,22 @@ public:
     QVector<QAxisInput *> m_inputs;
 };
 
+/*!
+ * \qmltype Axis
+ * \inqmlmodule Qt3D.Input
+ * \since 5.5
+ * \TODO
+ *
+ */
+
+/*!
+ * \class Qt3DInput::QAxis
+ * \inmodule Qt3DInput
+ * \since 5.5
+ * \TODO
+ *
+ */
+
 QAxis::QAxis(Qt3DCore::QNode *parent)
     : Qt3DCore::QNode(*new QAxisPrivate(), parent)
 {
diff --git a/src/input/frontend/qaxisactionhandler.cpp b/src/input/frontend/qaxisactionhandler.cpp
index bc161e70a..584937f82 100644
--- a/src/input/frontend/qaxisactionhandler.cpp
+++ b/src/input/frontend/qaxisactionhandler.cpp
@@ -48,12 +48,30 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
 
+/*! \internal */
 QAxisActionHandlerPrivate::QAxisActionHandlerPrivate()
     : Qt3DCore::QComponentPrivate()
     , m_logicalDevice(Q_NULLPTR)
 {
 }
 
+/*!
+ * \qmltype AxisActionHandler
+ * \instantiates Qt3DInput::QAxisActionHandler
+ * \inqmlmodule Qt3D.Input
+ * \since 5.5
+ * \TODO
+ *
+ */
+
+/*!
+ * \class Qt3DInput::QAxisActionHandler
+ * \inmodule Qt3DInput
+ * \since 5.5
+ * \TODO
+ *
+ */
+
 QAxisActionHandler::QAxisActionHandler(Qt3DCore::QNode *parent)
     : Qt3DCore::QComponent(*new QAxisActionHandlerPrivate, parent)
 {
diff --git a/src/input/frontend/qaxisinput.cpp b/src/input/frontend/qaxisinput.cpp
index ff9f6a611..6a81b22b0 100644
--- a/src/input/frontend/qaxisinput.cpp
+++ b/src/input/frontend/qaxisinput.cpp
@@ -61,7 +61,22 @@ public:
     int m_axis;
 };
 
-
+/*!
+ * \qmltype AxisInput
+ * \instantiates Qt3DInput::QAxisInput
+ * \inqmlmodule Qt3D.Input
+ * \since 5.5
+ * \TODO
+ *
+ */
+
+/*!
+ * \class Qt3DInput::QAxisInput
+ * \inmodule Qt3DInput
+ * \since 5.5
+ * \TODO
+ *
+ */
 QAxisInput::QAxisInput(Qt3DCore::QNode *parent)
     : QNode(*new QAxisInputPrivate(), parent)
 {
diff --git a/src/input/frontend/qaxissetting.cpp b/src/input/frontend/qaxissetting.cpp
index e6b3ef704..61e36713b 100644
--- a/src/input/frontend/qaxissetting.cpp
+++ b/src/input/frontend/qaxissetting.cpp
@@ -59,6 +59,24 @@ public:
     bool m_filter;
 };
 
+/*!
+ * \qmltype AxisSetting
+ * \instantiates Qt3DInput::QAxisSetting
+ * \inqmlmodule Qt3D.Input
+ * \since 5.5
+ * \TODO
+ *
+ */
+
+/*!
+ * \class Qt3DInput::QAxisSetting
+ * \inmodule Qt3DInput
+ * \since 5.5
+ * \TODO
+ *
+ */
+
+
 QAxisSetting::QAxisSetting(Qt3DCore::QNode *parent)
     : QNode(*new QAxisSettingPrivate(), parent)
 {
diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp
index 8fd9052fd..20b3e2a74 100644
--- a/src/input/frontend/qinputaspect.cpp
+++ b/src/input/frontend/qinputaspect.cpp
@@ -93,10 +93,6 @@ using namespace Qt3DCore;
 
 namespace Qt3DInput {
 
-/*!
-    \class Qt3DInput::QInputAspectPrivate
-    \internal
-*/
 QInputAspectPrivate::QInputAspectPrivate()
     : QAbstractAspectPrivate()
     , m_inputHandler(new Input::InputHandler())
diff --git a/src/input/frontend/qkeyboardcontroller.cpp b/src/input/frontend/qkeyboardcontroller.cpp
index 41001f076..1923c655c 100644
--- a/src/input/frontend/qkeyboardcontroller.cpp
+++ b/src/input/frontend/qkeyboardcontroller.cpp
@@ -49,10 +49,6 @@ using namespace Qt3DCore;
 
 namespace Qt3DInput {
 
-/*!
-    \class Qt3DInput::QKeyboardControllerPrivate
-    \internal
-*/
 QKeyboardControllerPrivate::QKeyboardControllerPrivate()
     : QAbstractPhysicalDevicePrivate()
 {
diff --git a/src/input/frontend/qkeyboardinput.cpp b/src/input/frontend/qkeyboardinput.cpp
index a0b06217e..4b9e3fab5 100644
--- a/src/input/frontend/qkeyboardinput.cpp
+++ b/src/input/frontend/qkeyboardinput.cpp
@@ -48,10 +48,6 @@ using namespace Qt3DCore;
 
 namespace Qt3DInput {
 
-/*!
-    \class Qt3DInput::QKeyboardInputPrivate
-    \internal
-*/
 QKeyboardInputPrivate::QKeyboardInputPrivate()
     : QComponentPrivate()
     , m_controller(Q_NULLPTR)
diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp
index 088e45b0d..ef3c90fa7 100644
--- a/src/input/frontend/qlogicaldevice.cpp
+++ b/src/input/frontend/qlogicaldevice.cpp
@@ -58,6 +58,22 @@ public:
     QVector<QAxis *> m_axes;
 };
 
+/*!
+ * \qmltype LogicalDevice
+ * \inqmlmodule Qt3D.Input
+ * \since 5.5
+ * \TODO
+ *
+ */
+
+/*!
+ * \class Qt3DInput::QLogicalDevice
+ * \inmodule Qt3DInput
+ * \since 5.5
+ * \TODO
+ *
+ */
+
 QLogicalDevice::QLogicalDevice(Qt3DCore::QNode *parent)
     : Qt3DCore::QNode(*new QLogicalDevicePrivate(), parent)
 {
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
diff --git a/src/input/frontend/qmouseevent.cpp b/src/input/frontend/qmouseevent.cpp
index 5cdc2b30d..cacfa9fda 100644
--- a/src/input/frontend/qmouseevent.cpp
+++ b/src/input/frontend/qmouseevent.cpp
@@ -51,6 +51,20 @@ namespace Qt3DInput {
 // These can always be added in follow up commits once the input API takes shape
 
 /*!
+ * \qmltype MouseEvent
+ * \instantiates Qt3DInput::QMouseEvent
+ * \inqmlmodule Qt3D.Input
+ * \since 5.5
+ * \brief Provides parameters that describe a mouse event.
+ *
+ * Mouse events occur when a mouse button is pressed and the ray
+ * traversing the view, originating from the mouse position intersects with one
+ * or more elements of the scene.
+ *
+ * \sa KeyEvent, WheelEvent, MouseInput
+ */
+
+/*!
  * \class Qt3DInput::QMouseEvent
  * \inmodule Qt3DInput
  *
@@ -161,6 +175,18 @@ QMouseEvent::Modifiers QMouseEvent::modifier() const
     }
 }
 
+/*!
+ * \qmltype WheelEvent
+ * \instantiates Qt3DInput::QWheelEvent
+ * \inqmlmodule Qt3D.Input
+ * \since 5.5
+ * \brief Contains parameters that describe a mouse wheel event.
+ *
+ * Mouse wheel events occur when the mouse wheel is rotated.
+ *
+ * \sa KeyEvent, MouseEvent, MouseInput
+ *
+ */
 
 /*!
  * \class Qt3DInput::QWheelEvent
diff --git a/src/input/frontend/qmouseinput.cpp b/src/input/frontend/qmouseinput.cpp
index d05efd875..2de9d3f08 100644
--- a/src/input/frontend/qmouseinput.cpp
+++ b/src/input/frontend/qmouseinput.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 using namespace Qt3DCore;
 
 namespace Qt3DInput {
-
+/*! \internal */
 QMouseInputPrivate::QMouseInputPrivate()
     : QComponentPrivate()
     , m_controller(Q_NULLPTR)
@@ -58,10 +58,21 @@ QMouseInputPrivate::QMouseInputPrivate()
 }
 
 /*!
+ * \qmltype MouseInput
+ * \instantiates Qt3DInput::QMouseInput
+ * \inqmlmodule Qt3D.Input
+ * \since 5.5
+ * \brief Provides mouse event notification
+ *
+ * \TODO
+ * \sa MouseController
+ */
+
+/*!
  * \class Qt3DInput::QMouseInput
  * \inmodule Qt3DInput
  *
- * \brief Provides a mean of being notified about mouse events when attached to
+ * \brief Provides a means of being notified about mouse events when attached to
  * a QMouseController instance.
  *
  * \since 5.5