1 files changed, 18 insertions, 7 deletions

diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
index 9b4bcf1575..04372ae4d9 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
+++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
@@ -116,7 +116,8 @@ QEvdevMouseHandler::QEvdevMouseHandler(const QString &device, int fd, bool abs,
 
     // socket notifier for events on the mouse device
     m_notify = new QSocketNotifier(m_fd, QSocketNotifier::Read, this);
-    connect(m_notify, SIGNAL(activated(int)), this, SLOT(readMouseData()));
+    connect(m_notify, &QSocketNotifier::activated,
+            this, &QEvdevMouseHandler::readMouseData);
 }
 
 QEvdevMouseHandler::~QEvdevMouseHandler()
@@ -183,7 +184,7 @@ void QEvdevMouseHandler::sendMouseEvent()
         m_prevInvalid = false;
     }
 
-    emit handleMouseEvent(x, y, m_abs, m_buttons);
+    emit handleMouseEvent(x, y, m_abs, m_buttons, m_button, m_eventType);
 
     m_prevx = m_x;
     m_prevy = m_y;
@@ -209,7 +210,7 @@ void QEvdevMouseHandler::readMouseData()
                 // by the above error over and over again.
                 if (errno == ENODEV) {
                     delete m_notify;
-                    m_notify = Q_NULLPTR;
+                    m_notify = nullptr;
                     qt_safe_close(m_fd);
                     m_fd = -1;
                 }
@@ -236,6 +237,7 @@ void QEvdevMouseHandler::readMouseData()
                 posChanged = true;
             }
         } else if (data->type == EV_REL) {
+            QPoint delta;
             if (data->code == REL_X) {
                 m_x += data->value;
                 posChanged = true;
@@ -244,12 +246,18 @@ void QEvdevMouseHandler::readMouseData()
                 posChanged = true;
             } else if (data->code == ABS_WHEEL) { // vertical scroll
                 // data->value: 1 == up, -1 == down
-                const int delta = 120 * data->value;
-                emit handleWheelEvent(delta, Qt::Vertical);
+                if (data->value == 1)
+                    delta.setY(120);
+                else
+                    delta.setY(-120);
+                emit handleWheelEvent(delta);
             } else if (data->code == ABS_THROTTLE) { // horizontal scroll
                 // data->value: 1 == right, -1 == left
-                const int delta = 120 * -data->value;
-                emit handleWheelEvent(delta, Qt::Horizontal);
+                if (data->value == 1)
+                    delta.setX(-120);
+                else
+                    delta.setX(120);
+                emit handleWheelEvent(delta);
             }
         } else if (data->type == EV_KEY && data->code == BTN_TOUCH) {
             // We care about touchpads only, not touchscreens -> don't map to button press.
@@ -278,6 +286,8 @@ void QEvdevMouseHandler::readMouseData()
             case 0x11f: button = Qt::ExtraButton13; break;
             }
             m_buttons.setFlag(button, data->value);
+            m_button = button;
+            m_eventType = data->value == 0 ? QEvent::MouseButtonRelease : QEvent::MouseButtonPress;
             btnChanged = true;
         } else if (data->type == EV_SYN && data->code == SYN_REPORT) {
             if (btnChanged) {
@@ -285,6 +295,7 @@ void QEvdevMouseHandler::readMouseData()
                 sendMouseEvent();
                 pendingMouseEvent = false;
             } else if (posChanged) {
+                m_eventType = QEvent::MouseMove;
                 posChanged = false;
                 if (m_compression) {
                     pendingMouseEvent = true;