diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-16 12:49:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-16 12:49:04 +0200 |
| commit | df36f287894dca61486b6769866718688cce12f3 (patch) | |
| tree | e8bffaca34adeb6e7d953ca66f863f2127183edc | |
| parent | eb5cd84d1fb2d602f2de8a7013498012b6b58d80 (diff) | |
| parent | 8ecbb7227b5bf2da6887e5a4ec0c7c7012affb6e (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3
Conflicts:
src/gamepad/qgamepad.cpp
Change-Id: I634213e4d668c778250dbd848f7dbd319c8457f1
| -rw-r--r-- | src/gamepad/qgamepad.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gamepad/qgamepad.cpp b/src/gamepad/qgamepad.cpp index 6632b30..6a1dc64 100644 --- a/src/gamepad/qgamepad.cpp +++ b/src/gamepad/qgamepad.cpp @@ -565,7 +565,6 @@ bool QGamepad::buttonA() const * * The state of the B button. * The value is \c true when pressed, and \c false when not pressed. - * */ /*! * \qmlproperty bool Gamepad::buttonB @@ -573,7 +572,6 @@ bool QGamepad::buttonA() const * * The state of the B button. * The value is \c true when pressed, and \c false when not pressed. - * */ bool QGamepad::buttonB() const { |