1 files changed, 11 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp
index 21aeda39..ef2077af 100644
--- a/src/quicktemplates2/qquickslider.cpp
+++ b/src/quicktemplates2/qquickslider.cpp
@@ -113,6 +113,7 @@ public:
     void handleRelease(const QPointF &point) override;
     void handleUngrab() override;
 
+    void cancelHandle();
     void executeHandle(bool complete = false);
 
     qreal from;
@@ -240,13 +241,19 @@ void QQuickSliderPrivate::handleUngrab()
 
 static inline QString handleName() { return QStringLiteral("handle"); }
 
+void QQuickSliderPrivate::cancelHandle()
+{
+    Q_Q(QQuickSlider);
+    quickCancelDeferred(q, handleName());
+}
+
 void QQuickSliderPrivate::executeHandle(bool complete)
 {
     Q_Q(QQuickSlider);
     if (handle.wasExecuted())
         return;
 
-    if (!handle)
+    if (!handle || complete)
         quickBeginDeferred(q, handleName(), handle);
     if (complete)
         quickCompleteDeferred(q, handleName(), handle);
@@ -546,6 +553,9 @@ void QQuickSlider::setHandle(QQuickItem *handle)
     if (d->handle == handle)
         return;
 
+    if (!d->handle.isExecuting())
+        d->cancelHandle();
+
     delete d->handle;
     d->handle = handle;
     if (handle && !handle->parentItem())