diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-17 18:26:21 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-17 18:26:22 +0100 |
| commit | 6620045fcaada61a2897195f32c0ee35beebc37b (patch) | |
| tree | 1a4027d021c10999bc1ff3ad9dc6e17ebb57dfc6 /src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp | |
| parent | 9baf824e4df5e9bc58b4fa1dc86e9a2e0d396ebb (diff) | |
| parent | 0649afd60c4d81fd8a6904d4e32737c647af578f (diff) | |
Merge dev into 5.7
Change-Id: I5c60b4d9fd8355ddd49a01e21861f36afbbf889b
Diffstat (limited to 'src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp')
| -rw-r--r-- | src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp index ce9043c0983..7f73a7ef94d 100644 --- a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp +++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp @@ -266,10 +266,7 @@ void QEvdevMouseHandler::readMouseData() case 0x11e: button = Qt::ExtraButton12; break; case 0x11f: button = Qt::ExtraButton13; break; } - if (data->value) - m_buttons |= button; - else - m_buttons &= ~button; + m_buttons.setFlag(button, data->value); btnChanged = true; } else if (data->type == EV_SYN && data->code == SYN_REPORT) { if (btnChanged) { |