From d10bfff89ae103d84a2438d9b8bc6e55ba3b122d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 1 Feb 2016 01:23:54 +0100 Subject: Revert "QWindow::destroy(): only reset QGuiApp::focus_window and friends as a last resort" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4c71db756741d35ccb32dc4c32aa1823264c85df. It's too risky for 5.6, we should let it cook in dev for a while and backport when ready. Change-Id: I91e677e65d967f29c84a254cd3dffc8bb847b263 Reviewed-by: Tor Arne Vestbø --- src/widgets/accessible/qaccessiblewidgetfactory.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/widgets/accessible') diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index 00e21da34d..4fa7c89482 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -43,7 +43,6 @@ #include #include #include -#include #ifndef QT_NO_ACCESSIBILITY @@ -54,15 +53,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje QAccessibleInterface *iface = 0; if (!object || !object->isWidgetType()) return iface; - - // QWidget emits destroyed() from its destructor instead of letting the QObject - // destructor do it, which means the QWidget is unregistered from the accessibillity - // cache. But QWidget destruction also emits enter and leave events, which may end - // up here, so we have to ensure that we don't fill the cache with an entry of - // a widget that is going away. QWidget *widget = static_cast(object); - if (QWidgetPrivate::get(widget)->data.in_destructor) - return iface; if (false) { #ifndef QT_NO_LINEEDIT -- cgit v1.2.3