5 files changed, 26 insertions, 7 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index bb1b9b15..a9a4ad72 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -653,6 +653,8 @@ QQuickOverlay *QQuickApplicationWindow::overlay() const
 
     if (!d->overlay) {
         d->overlay = new QQuickOverlay(QQuickWindow::contentItem());
+        // make the overlay discoverable by the virtual keyboard
+        d->q_ptr->setProperty("_q_QQuickOverlay", QVariant::fromValue<QQuickItem*>(d->overlay));
         d->overlay->stackAfter(QQuickApplicationWindow::contentItem());
     }
     return d->overlay;
diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
index b8d417f2..91bd5918 100644
--- a/src/quicktemplates2/qquickoverlay.cpp
+++ b/src/quicktemplates2/qquickoverlay.cpp
@@ -471,22 +471,27 @@ bool QQuickOverlay::childMouseEventFilter(QQuickItem *item, QEvent *event)
         // background dimming OR over another popup underneath, in case the popup
         // does not have background dimming.
         if (item == p->dimmer || !p->popupItem->isAncestorOf(item)) {
+            bool handled = false;
             switch (event->type()) {
 #if QT_CONFIG(quicktemplates2_multitouch)
             case QEvent::TouchBegin:
             case QEvent::TouchUpdate:
             case QEvent::TouchEnd:
-                return d->handleTouchEvent(item, static_cast<QTouchEvent *>(event), popup);
+                handled = d->handleTouchEvent(item, static_cast<QTouchEvent *>(event), popup);
+                break;
 #endif
 
             case QEvent::MouseButtonPress:
             case QEvent::MouseMove:
             case QEvent::MouseButtonRelease:
-                return d->handleMouseEvent(item, static_cast<QMouseEvent *>(event), popup);
+                handled = d->handleMouseEvent(item, static_cast<QMouseEvent *>(event), popup);
+                break;
 
             default:
                 break;
             }
+            if (handled)
+                return true;
         }
     }
     return false;
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index bdc6dff2..7df80a04 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -456,6 +456,9 @@ bool QQuickPopupPrivate::prepareEnterTransition()
         popupItem->setVisible(true);
         getPositioner()->setParentItem(parentItem);
         emit q->visibleChanged();
+
+        if (focus)
+            popupItem->setFocus(true);
     }
     return true;
 }
@@ -489,8 +492,6 @@ bool QQuickPopupPrivate::prepareExitTransition()
 void QQuickPopupPrivate::finalizeEnterTransition()
 {
     Q_Q(QQuickPopup);
-    if (focus)
-        popupItem->setFocus(true);
     transitionState = NoTransition;
     getPositioner()->reposition();
     emit q->openedChanged();
@@ -513,13 +514,14 @@ void QQuickPopupPrivate::finalizeExitTransition()
         if (QQuickOverlay *overlay = QQuickOverlay::overlay(window)) {
             const auto stackingOrderPopups = QQuickOverlayPrivate::get(overlay)->stackingOrderPopups();
             for (auto popup : stackingOrderPopups) {
-                if (QQuickPopupPrivate::get(popup)->transitionState != ExitTransition) {
+                if (QQuickPopupPrivate::get(popup)->transitionState != ExitTransition
+                         && popup->hasFocus()) {
                     nextFocusPopup = popup;
                     break;
                 }
             }
         }
-        if (nextFocusPopup && nextFocusPopup->hasFocus()) {
+        if (nextFocusPopup) {
             nextFocusPopup->forceActiveFocus();
         } else {
             QQuickApplicationWindow *applicationWindow = qobject_cast<QQuickApplicationWindow*>(window);
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp
index eb9c1bb1..f1e5c805 100644
--- a/src/quicktemplates2/qquickrangeslider.cpp
+++ b/src/quicktemplates2/qquickrangeslider.cpp
@@ -665,6 +665,10 @@ void QQuickRangeSlider::setFrom(qreal from)
     if (isComponentComplete()) {
         d->first->setValue(d->first->value());
         d->second->setValue(d->second->value());
+        auto *firstPrivate = QQuickRangeSliderNodePrivate::get(d->first);
+        auto *secondPrivate = QQuickRangeSliderNodePrivate::get(d->second);
+        firstPrivate->updatePosition(true);
+        secondPrivate->updatePosition();
     }
 }
 
@@ -693,6 +697,10 @@ void QQuickRangeSlider::setTo(qreal to)
     if (isComponentComplete()) {
         d->first->setValue(d->first->value());
         d->second->setValue(d->second->value());
+        auto *firstPrivate = QQuickRangeSliderNodePrivate::get(d->first);
+        auto *secondPrivate = QQuickRangeSliderNodePrivate::get(d->second);
+        firstPrivate->updatePosition(true);
+        secondPrivate->updatePosition();
     }
 }
 
diff --git a/src/quicktemplates2/quicktemplates2.pro b/src/quicktemplates2/quicktemplates2.pro
index 5138b610..a3f778b2 100644
--- a/src/quicktemplates2/quicktemplates2.pro
+++ b/src/quicktemplates2/quicktemplates2.pro
@@ -14,5 +14,7 @@ SOURCES += \
     $$PWD/qtquicktemplates2global.cpp
 
 include(quicktemplates2.pri)
-include(accessible/accessible.pri)
+qtConfig(accessibility) {
+    include(accessible/accessible.pri)
+}
 load(qt_module)