qiurui
/
qtgamepad
mirror of https://github.com/qt/qtgamepad.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.8' into 5.9 

Change-Id: Ic7edff3a9f06ae205a5944e423d9ecbbfa321896
This commit is contained in:
Liang Qi 2017-03-10 10:27:08 +01:00
parent 115080e0d7 72be0422f9
commit 951b5fb5e3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/gamepads/android/src/qandroidgamepadbackend_p.h
View File

@ -78,8 +78,8 @@ public:
bool handleGenericMotionEvent(jobject event) override;
protected:
bool start();
void stop();
bool start() override;
void stop() override;
public:
struct Mapping {

2
src/plugins/gamepads/xinput/qxinputgamepadbackend.cpp
View File

@ -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)) {