diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2016-02-15 11:17:03 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2016-02-16 10:13:00 +0000 |
| commit | 541a2f88dfd11e6ccc213eca5746c8e6ba3b992d (patch) | |
| tree | e254c939e032bd8d8b0ae32e6c384c34a2f99344 | |
| parent | af0301996302eb40572f721c231ce716d3511269 (diff) | |
Android: Fix default L2&R2 configuration.
Change-Id: Ie74342fa2ddca8ec87695e9a23210bafe4617b64
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
| -rw-r--r-- | src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp b/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp index 9fbd2b5..3e2154c 100644 --- a/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp +++ b/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp @@ -120,14 +120,18 @@ namespace { axisMap[motionField("AXIS_HAT_Y")].gamepadAxis = QGamepadManager::AxisLeftY; axisMap[motionField("AXIS_Z")].gamepadAxis = QGamepadManager::AxisRightX; axisMap[motionField("AXIS_RZ")].gamepadAxis = QGamepadManager::AxisRightY; - auto &axis = axisMap[motionField("AXIS_LTRIGGER")]; - axis.gamepadAxis = QGamepadManager::AxisInvalid; - axis.gamepadMinButton = QGamepadManager::ButtonL2; - axis.gamepadMaxButton = QGamepadManager::ButtonL2; - axis = axisMap[motionField("AXIS_RTRIGGER")]; - axis.gamepadAxis = QGamepadManager::AxisInvalid; - axis.gamepadMinButton = QGamepadManager::ButtonR2; - axis.gamepadMaxButton = QGamepadManager::ButtonR2; + { + auto &axis = axisMap[motionField("AXIS_LTRIGGER")]; + axis.gamepadAxis = QGamepadManager::AxisInvalid; + axis.gamepadMinButton = QGamepadManager::ButtonL2; + axis.gamepadMaxButton = QGamepadManager::ButtonL2; + } + { + auto &axis = axisMap[motionField("AXIS_RTRIGGER")]; + axis.gamepadAxis = QGamepadManager::AxisInvalid; + axis.gamepadMinButton = QGamepadManager::ButtonR2; + axis.gamepadMaxButton = QGamepadManager::ButtonR2; + } allAndroidAxes.push_back(motionField("AXIS_X")); allAndroidAxes.push_back(motionField("AXIS_Y")); |