Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Ic274a375d6fc1312ced2354e034dc0980dd47c51

1 files changed, 24 insertions, 0 deletions

diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 8e5945be41..5791432ba6 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -931,6 +931,30 @@ QWheelEvent::~QWheelEvent()
     \endlist
 */
 
+/*!
+    \fn QPoint QWheelEvent::position() const
+
+    Returns the position of the mouse cursor relative to the widget
+    that received the event.
+
+    If you move your widgets around in response to mouse events,
+    use globalPosition() instead of this function.
+
+    \sa globalPosition()
+*/
+
+/*!
+    \fn QPoint QWheelEvent::globalPosition() const
+
+    Returns the global position of the mouse pointer \e{at the time
+    of the event}. This is important on asynchronous window systems
+    such as X11; whenever you move your widgets around in response to
+    mouse events, globalPosition() can differ a lot from the current
+    cursor position returned by QCursor::pos().
+
+    \sa position()
+*/
+
 #if QT_DEPRECATED_SINCE(5, 15)
 /*!
     \fn int QWheelEvent::delta() const