aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@digia.com>2014-08-26 10:28:53 +0200
committerLaszlo Agocs <laszlo.agocs@digia.com>2014-08-26 11:46:50 +0200
commit657766f19b31d83f361fd3c9ad717b207e1dff8c (patch)
tree12c6547227feb509052df3e6ed89e833c69de69f
parente525c551394ba2827e4494bfb72ff43171e9b7e1 (diff)
Do not send deferred deletes from the QQuickWindow dtor
Otherwise doing deleteLater() on an ancestor of the QQuickWindow will cause double deletion for that ancestor. This is typical when using WA_DeleteOnClose since that uses deleteLater(). Task-number: QTBUG-40920 Change-Id: I9146fc0854f77c42cad2eda23b3cdaa7a9e22080 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
-rw-r--r--src/quick/items/qquickwindow.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 1ec7837cfa..5172689208 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -1108,8 +1108,6 @@ QQuickWindow::~QQuickWindow()
d->windowManager->windowDestroyed(this);
}
- QCoreApplication::removePostedEvents(this, QEvent::DeferredDelete);
- QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
delete d->incubationController; d->incubationController = 0;
#ifndef QT_NO_DRAGANDDROP
delete d->dragGrabber; d->dragGrabber = 0;