1 files changed, 10 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp
index d2458c24..319f7bbe 100644
--- a/src/quicktemplates2/qquicktextarea.cpp
+++ b/src/quicktemplates2/qquicktextarea.cpp
@@ -440,13 +440,19 @@ QAccessible::Role QQuickTextAreaPrivate::accessibleRole() const
 
 static inline QString backgroundName() { return QStringLiteral("background"); }
 
+void QQuickTextAreaPrivate::cancelBackground()
+{
+    Q_Q(QQuickTextArea);
+    quickCancelDeferred(q, backgroundName());
+}
+
 void QQuickTextAreaPrivate::executeBackground(bool complete)
 {
     Q_Q(QQuickTextArea);
     if (background.wasExecuted())
         return;
 
-    if (!background)
+    if (!background || complete)
         quickBeginDeferred(q, backgroundName(), background);
     if (complete)
         quickCompleteDeferred(q, backgroundName(), background);
@@ -517,6 +523,9 @@ void QQuickTextArea::setBackground(QQuickItem *background)
     if (d->background == background)
         return;
 
+    if (!d->background.isExecuting())
+        d->cancelBackground();
+
     delete d->background;
     d->background = background;
     if (background) {