2 files changed, 12 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp
index fa08a1d8..5e3d6418 100644
--- a/src/quicktemplates2/qquickswitch.cpp
+++ b/src/quicktemplates2/qquickswitch.cpp
@@ -186,10 +186,14 @@ void QQuickSwitch::mirrorChange()
 void QQuickSwitch::nextCheckState()
 {
     Q_D(QQuickSwitch);
-    if (keepMouseGrab())
+    if (keepMouseGrab()) {
         setChecked(d->position > 0.5);
-    else
+        // the checked state might not change => force a position update to
+        // avoid that the handle is left somewhere in the middle (QTBUG-57944)
+        checkStateSet();
+    } else {
         QQuickAbstractButton::nextCheckState();
+    }
 }
 
 void QQuickSwitch::checkStateSet()
diff --git a/src/quicktemplates2/qquickswitchdelegate.cpp b/src/quicktemplates2/qquickswitchdelegate.cpp
index 81e282d9..e659b927 100644
--- a/src/quicktemplates2/qquickswitchdelegate.cpp
+++ b/src/quicktemplates2/qquickswitchdelegate.cpp
@@ -191,10 +191,14 @@ void QQuickSwitchDelegate::mirrorChange()
 void QQuickSwitchDelegate::nextCheckState()
 {
     Q_D(QQuickSwitchDelegate);
-    if (keepMouseGrab())
+    if (keepMouseGrab()) {
         setChecked(d->position > 0.5);
-    else
+        // the checked state might not change => force a position update to
+        // avoid that the handle is left somewhere in the middle (QTBUG-57944)
+        checkStateSet();
+    } else {
         QQuickItemDelegate::nextCheckState();
+    }
 }
 
 void QQuickSwitchDelegate::checkStateSet()