diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:01:56 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:01:56 +0200 |
| commit | bc55e89e7c894b8c58183be086e0de49f827b541 (patch) | |
| tree | fcfba026f3ccd172058e83c8faba3f2d5421afe7 | |
| parent | 01964352c71d8644b1c4da56d47f90120bad1317 (diff) | |
| parent | 505653220f9c609cfbedcb7d81f1f30bf6d247e5 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I6a97101dc3801171724d6c8bca53a0a46f34651c
| -rw-r--r-- | dist/changes-5.11.1 | 24 | ||||
| -rw-r--r-- | examples/gamepad/configureButtons/doc/src/configbuttonsexample.qdoc | 2 | ||||
| -rw-r--r-- | src/gamepad/qgamepad.cpp | 2 |
3 files changed, 26 insertions, 2 deletions
diff --git a/dist/changes-5.11.1 b/dist/changes-5.11.1 new file mode 100644 index 0000000..030ea3f --- /dev/null +++ b/dist/changes-5.11.1 @@ -0,0 +1,24 @@ +Qt 5.11.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.11.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.11.1 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/examples/gamepad/configureButtons/doc/src/configbuttonsexample.qdoc b/examples/gamepad/configureButtons/doc/src/configbuttonsexample.qdoc index 2e9c7f9..959dcd4 100644 --- a/examples/gamepad/configureButtons/doc/src/configbuttonsexample.qdoc +++ b/examples/gamepad/configureButtons/doc/src/configbuttonsexample.qdoc @@ -29,7 +29,7 @@ \example configureButtons \ingroup qtgamepad-examples \title Qt Gamepad Configure Buttons Example -\brief Enables configuring the gamepad buttons +\brief Enables configuring the gamepad buttons. \image configuregamepadbuttons-example.png \include examples-run.qdocinc */ diff --git a/src/gamepad/qgamepad.cpp b/src/gamepad/qgamepad.cpp index 7af71fc..4b9e25e 100644 --- a/src/gamepad/qgamepad.cpp +++ b/src/gamepad/qgamepad.cpp @@ -368,7 +368,7 @@ void QGamepadPrivate::_q_handleGamepadButtonReleaseEvent(int id, QGamepadManager /*! \class QGamepad \inmodule QtGamepad - \brief A gamepad device connected to a system + \brief A gamepad device connected to a system. QGamepad is used to access the current state of gamepad hardware connected to a system. |