diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-11 09:25:21 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-11 08:59:29 +0000 |
commit | c736c5c27ca1ade83427f7379daef2c46a6df689 (patch) | |
tree | 0b7c739653c7748459aba9824b3c62d0901f7aa0 /src | |
parent | 55522df46edd295a65edd32e0ca7d32408ab6de4 (diff) |
Remove unused QQuickControlPrivate::destroyDelegate()
Task-number: QTBUG-65341
Change-Id: Ib64ec7ede42c140483554cf75e9bc16aa147be6c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 23 | ||||
-rw-r--r-- | src/quicktemplates2/qquickcontrol_p_p.h | 2 |
2 files changed, 0 insertions, 25 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 6fbd4c07..809c9f94 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> @@ -979,28 +978,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; -} - void QQuickControlPrivate::updateLocale(const QLocale &l, bool e) { Q_Q(QQuickControl); diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h index 3ed8b637..d0ca576d 100644 --- a/src/quicktemplates2/qquickcontrol_p_p.h +++ b/src/quicktemplates2/qquickcontrol_p_p.h @@ -133,8 +133,6 @@ public: virtual void cancelBackground(); virtual void executeBackground(bool complete = false); - static void destroyDelegate(QObject *object, QObject *parent); - struct ExtraData { ExtraData(); QFont font; |