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

Change-Id: Id3333e9bb67ced4c6dbae5845512fe1927a7b858

1 files changed, 11 insertions, 3 deletions

diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 3c3b67f8..c2d63f02 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -163,11 +163,19 @@ bool QQuickControlPrivate::acceptTouch(const QTouchEvent::TouchPoint &point)
 }
 #endif
 
+static void setActiveFocus(QQuickControl *control, Qt::FocusReason reason)
+{
+    QQuickControlPrivate *d = QQuickControlPrivate::get(control);
+    if (d->subFocusItem && d->window && d->flags & QQuickItem::ItemIsFocusScope)
+        QQuickWindowPrivate::get(d->window)->clearFocusInScope(control, d->subFocusItem, reason);
+    control->forceActiveFocus(reason);
+}
+
 void QQuickControlPrivate::handlePress(const QPointF &)
 {
     Q_Q(QQuickControl);
     if ((focusPolicy & Qt::ClickFocus) == Qt::ClickFocus && !QGuiApplication::styleHints()->setFocusOnTouchRelease())
-        q->forceActiveFocus(Qt::MouseFocusReason);
+        setActiveFocus(q, Qt::MouseFocusReason);
 }
 
 void QQuickControlPrivate::handleMove(const QPointF &point)
@@ -184,7 +192,7 @@ void QQuickControlPrivate::handleRelease(const QPointF &)
 {
     Q_Q(QQuickControl);
     if ((focusPolicy & Qt::ClickFocus) == Qt::ClickFocus && QGuiApplication::styleHints()->setFocusOnTouchRelease())
-        q->forceActiveFocus(Qt::MouseFocusReason);
+        setActiveFocus(q, Qt::MouseFocusReason);
     touchId = -1;
 }
 
@@ -1683,7 +1691,7 @@ void QQuickControl::wheelEvent(QWheelEvent *event)
 {
     Q_D(QQuickControl);
     if ((d->focusPolicy & Qt::WheelFocus) == Qt::WheelFocus)
-        forceActiveFocus(Qt::MouseFocusReason);
+        setActiveFocus(this, Qt::MouseFocusReason);
 
     event->setAccepted(d->wheelEnabled);
 }