1 files changed, 20 insertions, 17 deletions
diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h
index 8f55c1801f..fa524fd8ca 100644
--- a/src/testlib/qtestmouse.h
+++ b/src/testlib/qtestmouse.h
@@ -64,7 +64,9 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_GUI_EXPORT void qt_handleMouseEvent(QWindow *w, const QPointF &local, const QPointF &global, Qt::MouseButtons b, Qt::KeyboardModifiers mods, int timestamp);
+Q_GUI_EXPORT void qt_handleMouseEvent(QWindow *window, const QPointF &local, const QPointF &global,
+                                      Qt::MouseButtons state, Qt::MouseButton button,
+                                      QEvent::Type type, Qt::KeyboardModifiers mods, int timestamp);
 
 namespace QTest
 {
@@ -78,15 +80,13 @@ namespace QTest
     // to depend on platform themes.
     static const int mouseDoubleClickInterval = 500;
 
-    static void waitForEvents()
-    {
-#ifdef Q_OS_MAC
-        QTest::qWait(20);
-#else
-        qApp->processEvents();
-#endif
-    }
+/*! \internal
 
+    This function mocks all mouse events by bypassing the windowing system. The
+    result is that the mouse events do not come from the system via Qt platform
+    plugins, but are created on the spot and immediately available for processing
+    by Qt.
+*/
     static void mouseEvent(MouseAction action, QWindow *window, Qt::MouseButton button,
                            Qt::KeyboardModifiers stateKey, QPoint pos, int delay=-1)
     {
@@ -120,30 +120,33 @@ namespace QTest
         switch (action)
         {
         case MouseDClick:
-            qt_handleMouseEvent(w, pos, global, button, stateKey, ++lastMouseTimestamp);
-            qt_handleMouseEvent(w, pos, global, Qt::NoButton, stateKey, ++lastMouseTimestamp);
+            qt_handleMouseEvent(w, pos, global, button, button, QEvent::MouseButtonPress,
+                                stateKey, ++lastMouseTimestamp);
+            qt_handleMouseEvent(w, pos, global, Qt::NoButton, button, QEvent::MouseButtonRelease,
+                                stateKey, ++lastMouseTimestamp);
             Q_FALLTHROUGH();
         case MousePress:
         case MouseClick:
-            qt_handleMouseEvent(w, pos, global, button, stateKey, ++lastMouseTimestamp);
+            qt_handleMouseEvent(w, pos, global, button, button, QEvent::MouseButtonPress,
+                                stateKey, ++lastMouseTimestamp);
             lastMouseButton = button;
             if (action == MousePress)
                 break;
             Q_FALLTHROUGH();
         case MouseRelease:
-            qt_handleMouseEvent(w, pos, global, Qt::NoButton, stateKey, ++lastMouseTimestamp);
+            qt_handleMouseEvent(w, pos, global, Qt::NoButton, button, QEvent::MouseButtonRelease,
+                                stateKey, ++lastMouseTimestamp);
             lastMouseTimestamp += mouseDoubleClickInterval; // avoid double clicks being generated
             lastMouseButton = Qt::NoButton;
             break;
         case MouseMove:
-            qt_handleMouseEvent(w, pos, global, lastMouseButton, stateKey, ++lastMouseTimestamp);
-            // No QCursor::setPos() call here. That could potentially result in mouse events sent by the windowing system
-            // which is highly undesired here. Tests must avoid relying on QCursor.
+            qt_handleMouseEvent(w, pos, global, lastMouseButton, Qt::NoButton, QEvent::MouseMove,
+                                stateKey, ++lastMouseTimestamp);
             break;
         default:
             QTEST_ASSERT(false);
         }
-        waitForEvents();
+        qApp->processEvents();
     }
 
     inline void mousePress(QWindow *window, Qt::MouseButton button,