1 files changed, 12 insertions, 23 deletions

diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 0a0b7fad..157c539e 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -935,21 +935,9 @@ void QQuickControl::setFocusPolicy(Qt::FocusPolicy policy)
     \qmlproperty enumeration QtQuick.Controls::Control::focusReason
     \readonly
 
-    This property holds the reason of the last focus change.
+    \include qquickcontrol-focusreason.qdocinc
 
-    \note This property does not indicate whether the control has \l {Item::activeFocus}
-          {active focus}, but the reason why the control either gained or lost focus.
-
-    \value Qt.MouseFocusReason         A mouse action occurred.
-    \value Qt.TabFocusReason           The Tab key was pressed.
-    \value Qt.BacktabFocusReason       A Backtab occurred. The input for this may include the Shift or Control keys; e.g. Shift+Tab.
-    \value Qt.ActiveWindowFocusReason  The window system made this window either active or inactive.
-    \value Qt.PopupFocusReason         The application opened/closed a pop-up that grabbed/released the keyboard focus.
-    \value Qt.ShortcutFocusReason      The user typed a label's buddy shortcut
-    \value Qt.MenuBarFocusReason       The menu bar took focus.
-    \value Qt.OtherFocusReason         Another reason, usually application-specific.
-
-    \sa visualFocus, Item::activeFocus
+    \sa visualFocus
 */
 Qt::FocusReason QQuickControl::focusReason() const
 {
@@ -1094,15 +1082,7 @@ void QQuickControl::setWheelEnabled(bool enabled)
     }
     \endcode
 
-    \note If the background item has no explicit size specified, it automatically
-          follows the control's size. In most cases, there is no need to specify
-          width or height for a background item.
-
-    \note Most controls use the implicit size of the background item to calculate
-    the implicit size of the control itself. If you replace the background item
-    with a custom one, you should also consider providing a sensible implicit
-    size for it (unless it is an item like \l Image which has its own implicit
-    size).
+    \input qquickcontrol-background.qdocinc notes
 
     \sa {Control Layout}
 */
@@ -1232,6 +1212,13 @@ void QQuickControl::hoverEnterEvent(QHoverEvent *event)
     event->setAccepted(d->hoverEnabled);
 }
 
+void QQuickControl::hoverMoveEvent(QHoverEvent *event)
+{
+    Q_D(QQuickControl);
+    setHovered(d->hoverEnabled && contains(event->pos()));
+    event->setAccepted(d->hoverEnabled);
+}
+
 void QQuickControl::hoverLeaveEvent(QHoverEvent *event)
 {
     Q_D(QQuickControl);
@@ -1250,6 +1237,8 @@ void QQuickControl::mousePressEvent(QMouseEvent *event)
 
 void QQuickControl::mouseMoveEvent(QMouseEvent *event)
 {
+    Q_D(QQuickControl);
+    setHovered(d->hoverEnabled && contains(event->pos()));
     event->accept();
 }