Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1

Change-Id: I94da6595c8031d04c407678a2741aacc71c2ebe2

1 files changed, 20 insertions, 1 deletions

diff --git a/src/gamepad/qgamepadmanager.cpp b/src/gamepad/qgamepadmanager.cpp
index 4c86e62..c8a0eb5 100644
--- a/src/gamepad/qgamepadmanager.cpp
+++ b/src/gamepad/qgamepadmanager.cpp
@@ -144,6 +144,17 @@ void QGamepadManagerPrivate::loadBackend()
  */
 
 /*!
+ * \qmltype GamepadManager
+ * \inqmlmodule QtGamepad
+ * \instantiates QGamepadManager
+ * \brief Queries attached gamepads and related events.
+ *
+ * GamepadManager QML type provides a high-level interface for
+ * querying the attached gamepads and events related to all of the
+ * connected devices.
+ */
+
+/*!
  * Constructor for QGamepadManager.
  */
 
@@ -213,7 +224,15 @@ QString QGamepadManager::gamepadName(int deviceId) const
 }
 
 /*!
-    Returns a QList containing the \l {QGamepad::}{deviceId}
+   \qmlproperty var GamepadManager::connectedGamepads
+   \readonly
+
+    Returns a list of integers containing the \l {QGamepad::}{deviceId}
+    values of the connected gamepads.
+*/
+
+/*!
+    Returns a list of integers containing the \l {QGamepad::}{deviceId}
     values of the connected gamepads.
 */
 const QList<int> QGamepadManager::connectedGamepads() const