aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-01 03:04:58 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-01 03:04:58 +0200
commit3060923320a580a05a377e6051e00cff7520ae76 (patch)
treef808c08acc32026e85a7b29e181be9e6a38eef6e
parenta20e1d6c96ae9eb71b12d62f6d51ee4266477134 (diff)
parent799094080f0bf13a0c8b1675fb2de8d5cc96d32a (diff)
Merge remote-tracking branch 'origin/5.15' into dev
-rw-r--r--src/gamepad/doc/src/qtgamepad-index.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gamepad/doc/src/qtgamepad-index.qdoc b/src/gamepad/doc/src/qtgamepad-index.qdoc
index 3b4cd36..146cb49 100644
--- a/src/gamepad/doc/src/qtgamepad-index.qdoc
+++ b/src/gamepad/doc/src/qtgamepad-index.qdoc
@@ -59,7 +59,7 @@
are not in scope for this module. A number of third-party gamepads may be
supported as well, however, some of these may need custom configuration steps
in order to map the button/trigger codes the device or driver in question
- provides onto what QtGamepad expects. The can be done by the
+ provides onto what QtGamepad expects. This can be done by the
\l{Qt Gamepad Configure Buttons Example}{configureButtons} example that can also
save the generated layout persistently for use by other applications.