Merge remote-tracking branch 'origin/5.9' into 5.10

Conflicts:
	src/quicktemplates2/qquickcontrol.cpp
	tests/auto/sanity/tst_sanity.cpp

Change-Id: I62a79fd7788fec635b9917fc91bacd7338b547fd

2 files changed, 0 insertions, 25 deletions

diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index f860bcad..080317d8 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -52,7 +52,6 @@
 
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/qpa/qplatformtheme.h>
-#include <QtQml/private/qqmlincubator_p.h>
 
 #if QT_CONFIG(accessibility)
 #include <QtQuick/private/qquickaccessibleattached_p.h>
@@ -690,28 +689,6 @@ void QQuickControlPrivate::executeBackground(bool complete)
         quickCompleteDeferred(q, backgroundName(), background);
 }
 
-/*
-    Cancels incubation recursively to avoid "Object destroyed during incubation" (QTBUG-50992)
-*/
-static void cancelIncubation(QObject *object, QQmlContext *context)
-{
-    const auto children = object->children();
-    for (QObject *child : children)
-        cancelIncubation(child, context);
-    QQmlIncubatorPrivate::cancel(object, context);
-}
-
-void QQuickControlPrivate::destroyDelegate(QObject *delegate, QObject *parent)
-{
-    if (!delegate)
-        return;
-
-    QQmlContext *context = parent ? qmlContext(parent) : nullptr;
-    if (context)
-        cancelIncubation(delegate, context);
-    delete delegate;
-}
-
 QQuickControl::QQuickControl(QQuickItem *parent)
     : QQuickItem(*(new QQuickControlPrivate), parent)
 {
diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h
index 3fe0a65b..7d040ded 100644
--- a/src/quicktemplates2/qquickcontrol_p_p.h
+++ b/src/quicktemplates2/qquickcontrol_p_p.h
@@ -146,8 +146,6 @@ public:
     virtual void cancelBackground();
     virtual void executeBackground(bool complete = false);
 
-    static void destroyDelegate(QObject *object, QObject *parent);
-
     struct ExtraData {
         ExtraData();
         QFont requestedFont;