aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-28 03:04:52 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-28 03:04:53 +0200
commitaae00425dc92851ba685d22f0bcd9bab4f6c7f33 (patch)
treef808c08acc32026e85a7b29e181be9e6a38eef6e
parentb6f312348d4cecca6220e5539cb7106fdd7d9e74 (diff)
parent256bcfb73570c3f732ee5a7fcb0d40b3c08d55ff (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
-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.