1 files changed, 11 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickgroupbox.cpp b/src/quicktemplates2/qquickgroupbox.cpp
index 674f5b18..3c7bf715 100644
--- a/src/quicktemplates2/qquickgroupbox.cpp
+++ b/src/quicktemplates2/qquickgroupbox.cpp
@@ -91,6 +91,7 @@ class QQuickGroupBoxPrivate : public QQuickFramePrivate
 public:
     QQuickGroupBoxPrivate() : label(nullptr) { }
 
+    void cancelLabel();
     void executeLabel(bool complete = false);
 
     QString title;
@@ -99,13 +100,19 @@ public:
 
 static inline QString labelName() { return QStringLiteral("label"); }
 
+void QQuickGroupBoxPrivate::cancelLabel()
+{
+    Q_Q(QQuickGroupBox);
+    quickCancelDeferred(q, labelName());
+}
+
 void QQuickGroupBoxPrivate::executeLabel(bool complete)
 {
     Q_Q(QQuickGroupBox);
     if (label.wasExecuted())
         return;
 
-    if (!label)
+    if (!label || complete)
         quickBeginDeferred(q, labelName(), label);
     if (complete)
         quickCompleteDeferred(q, labelName(), label);
@@ -162,6 +169,9 @@ void QQuickGroupBox::setLabel(QQuickItem *label)
     if (d->label == label)
         return;
 
+    if (!d->label.isExecuting())
+        d->cancelLabel();
+
     delete d->label;
     d->label = label;
     if (label && !label->parentItem())