diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:08 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:08 +0100 |
| commit | 951b5fb5e39df3caa09b5e52292b1ac22c4dfe03 (patch) | |
| tree | 38dcd17a4afe8f13de8f1f0977976cbe4b2ca6d3 | |
| parent | 115080e0d7459f2a7e7039944cc5a57518b6dd16 (diff) | |
| parent | 72be0422f98cdcfa09b7aa019ce51ac473569db5 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ic7edff3a9f06ae205a5944e423d9ecbbfa321896
| -rw-r--r-- | src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h | 4 | ||||
| -rw-r--r-- | src/plugins/gamepads/xinput/qxinputgamepadbackend.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h b/src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h index fdd1619..fc96c9b 100644 --- a/src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h +++ b/src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h @@ -78,8 +78,8 @@ public: bool handleGenericMotionEvent(jobject event) override; protected: - bool start(); - void stop(); + bool start() override; + void stop() override; public: struct Mapping { diff --git a/src/plugins/gamepads/xinput/qxinputgamepadbackend.cpp b/src/plugins/gamepads/xinput/qxinputgamepadbackend.cpp index e9a04a4..4d042c9 100644 --- a/src/plugins/gamepads/xinput/qxinputgamepadbackend.cpp +++ b/src/plugins/gamepads/xinput/qxinputgamepadbackend.cpp @@ -138,7 +138,7 @@ void QXInputThread::dispatch(int idx, XINPUT_GAMEPAD *state) { XINPUT_GAMEPAD_X, QGamepadManager::ButtonX }, { XINPUT_GAMEPAD_Y, QGamepadManager::ButtonY } }; - for (int i = 0; i < sizeof(buttonMap) / sizeof(ButtonMap); ++i) { + for (uint i = 0; i < sizeof(buttonMap) / sizeof(ButtonMap); ++i) { const unsigned short xb = buttonMap[i].xbutton; unsigned short isDown = state->wButtons & xb; if (isDown != (m_controllers[idx].buttons & xb)) { |