Merge 5.12 into 5.12.9v5.12.9

Change-Id: I378438b043896fb76ce4007da7442f5322a63a06

1 files changed, 2 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickstackview_p_p.h b/src/quicktemplates2/qquickstackview_p_p.h
index b687561c..91f74edc 100644
--- a/src/quicktemplates2/qquickstackview_p_p.h
+++ b/src/quicktemplates2/qquickstackview_p_p.h
@@ -72,6 +72,7 @@ public:
     }
 
     void warn(const QString &error);
+    void warnOfInterruption(const QString &attemptedOperation);
 
     void setCurrentItem(QQuickStackElement *element);
 
@@ -93,7 +94,7 @@ public:
     void depthChange(int newDepth, int oldDepth);
 
     bool busy = false;
-    bool removingElements = false;
+    bool modifyingElements = false;
     QString operation;
     QJSValue initialItem;
     QQuickItem *currentItem = nullptr;