Revert "QWindow::destroy(): only reset QGuiApp::focus_window and friends as a last resort"

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ø <tor.arne.vestbo@theqtcompany.com>

1 files changed, 0 insertions, 9 deletions

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 <qtreeview.h>
 #include <qvariant.h>
 #include <qaccessible.h>
-#include <private/qwidget_p.h>
 
 #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<QWidget*>(object);
-    if (QWidgetPrivate::get(widget)->data.in_destructor)
-        return iface;
 
     if (false) {
 #ifndef QT_NO_LINEEDIT