diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-17 10:38:42 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-17 10:38:42 +0200 |
| commit | 19ca9370409d82a00841372df2e8bc0bf35148e7 (patch) | |
| tree | 9a8d02d43fd1ed753a6e3b98baf62015a6f589db | |
| parent | 8ecbb7227b5bf2da6887e5a4ec0c7c7012affb6e (diff) | |
| parent | cf48d4694edd6a16cd3bf56922ab20d8bd6b7fe7 (diff) | |
Merge remote-tracking branch 'origin/5.12.3' into 5.12
Change-Id: I0824edbea393edace8932ae07f6e6b2520c64f57
| -rw-r--r-- | dist/changes-5.12.3 | 20 | ||||
| -rw-r--r-- | src/gamepad/qgamepad.cpp | 4 |
2 files changed, 22 insertions, 2 deletions
diff --git a/dist/changes-5.12.3 b/dist/changes-5.12.3 new file mode 100644 index 0000000..8803320 --- /dev/null +++ b/dist/changes-5.12.3 @@ -0,0 +1,20 @@ +Qt 5.12.3 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.2. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +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. + + - This release contains only minor code improvements. diff --git a/src/gamepad/qgamepad.cpp b/src/gamepad/qgamepad.cpp index d55b169..e4f9179 100644 --- a/src/gamepad/qgamepad.cpp +++ b/src/gamepad/qgamepad.cpp @@ -823,14 +823,14 @@ bool QGamepad::buttonUp() const * \property QGamepad::buttonDown * \readonly * - * The of the direction pad down button. + * The state of the direction pad down button. * The value is \c true when pressed, and \c false when not pressed. */ /*! * \qmlproperty bool Gamepad::buttonDown * \readonly * - * The of the direction pad down button. + * The state of the direction pad down button. * The value is \c true when pressed, and \c false when not pressed. */ bool QGamepad::buttonDown() const |