QtWidgets: Propagate event device when translating mouse events

There are a few places left over, for example the QTextEdit
creating mouse events in a timer and notably QGraphicsView.

Task-number: QTBUG-88678
Task-number: QTBUG-46412
Pick-to: 6.0
Change-Id: I7ed23911be3b86b4b39fb478b947ec3b7a60761f
Reviewed-by: Oliver Wolff <[email protected]>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
index c88d63686cd..e4e8f9f9d18 100644
--- a/src/widgets/kernel/qwidgetwindow.cpp
+++ b/src/widgets/kernel/qwidgetwindow.cpp
@@ -569,7 +569,8 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event)
                 const auto buttons = event->type() == QEvent::MouseMove && qt_popup_down_closed
                                    ? Qt::NoButton : event->buttons();
                 QMouseEvent e(event->type(), widgetPos, event->scenePosition(), event->globalPosition(),
-                              event->button(), buttons, event->modifiers(), event->source());
+                              event->button(), buttons, event->modifiers(),
+                              event->source(), event->pointingDevice());
                 e.setTimestamp(event->timestamp());
                 QApplicationPrivate::sendMouseEvent(receiver, &e, receiver, receiver->window(), &qt_button_down, qt_last_mouse_receiver);
                 qt_last_mouse_receiver = receiver;
@@ -671,7 +672,8 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event)
         // The preceding statement excludes MouseButtonPress events which caused
         // creation of a MouseButtonDblClick event. QTBUG-25831
         QMouseEvent translated(event->type(), mapped, event->scenePosition(), event->globalPosition(),
-                               event->button(), event->buttons(), event->modifiers(), event->source());
+                               event->button(), event->buttons(), event->modifiers(),
+                               event->source(), event->pointingDevice());
         translated.setTimestamp(event->timestamp());
         QApplicationPrivate::sendMouseEvent(receiver, &translated, widget, m_widget,
                                             &qt_button_down, qt_last_mouse_receiver);