aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-24 03:05:26 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-24 03:05:32 +0200
commit256bcfb73570c3f732ee5a7fcb0d40b3c08d55ff (patch)
tree26969eeb135ff14cd3c5a988ba6c17bdb553496e
parent2e83eda3e897edd440ed064f8cf12890e8a54591 (diff)
parent13247cc1ef94a918c67034b4a6851f61fa88996e (diff)
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
-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.