1 files changed, 10 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp
index 03da9323..49f9b4c8 100644
--- a/src/quicktemplates2/qquicktextfield.cpp
+++ b/src/quicktemplates2/qquicktextfield.cpp
@@ -314,13 +314,19 @@ QAccessible::Role QQuickTextFieldPrivate::accessibleRole() const
 
 static inline QString backgroundName() { return QStringLiteral("background"); }
 
+void QQuickTextFieldPrivate::cancelBackground()
+{
+    Q_Q(QQuickTextField);
+    quickCancelDeferred(q, backgroundName());
+}
+
 void QQuickTextFieldPrivate::executeBackground(bool complete)
 {
     Q_Q(QQuickTextField);
     if (background.wasExecuted())
         return;
 
-    if (!background)
+    if (!background || complete)
         quickBeginDeferred(q, backgroundName(), background);
     if (complete)
         quickCompleteDeferred(q, backgroundName(), background);
@@ -379,6 +385,9 @@ void QQuickTextField::setBackground(QQuickItem *background)
     if (d->background == background)
         return;
 
+    if (!d->background.isExecuting())
+        d->cancelBackground();
+
     delete d->background;
     d->background = background;
     if (background) {