diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-23 03:01:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-23 03:01:09 +0200 |
| commit | eba95c27bee1f0798e9796e36689e7438902a179 (patch) | |
| tree | 97aa22c57d712b734d8bfed87bb078a0c990e1d4 | |
| parent | df36f287894dca61486b6769866718688cce12f3 (diff) | |
| parent | 19ca9370409d82a00841372df2e8bc0bf35148e7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I30d5db204888885e9cf490d72041377402558398
| -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 6a1dc64..ff57db6 100644 --- a/src/gamepad/qgamepad.cpp +++ b/src/gamepad/qgamepad.cpp @@ -803,14 +803,14 @@ bool QGamepad::buttonUp() const /*! * \property QGamepad::buttonDown * - * 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 |