Remove AccessibilityPrepare event.

This event was completely unused.
In addition it leads to crashes on linux when
sending the Destroy accessibility update.

The Destroy event on linux would still query an accessible interface.
That in turn would trigger the event to be sent.

Change-Id: I8915527de067b8b70ba41b1361e3ef5d12866d7d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>

diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index cac89f2..1d54b32 100644 (file)
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -127,7 +127,6 @@ public:
         DeactivateControl = 81,                 // ActiveX deactivation
         ContextMenu = 82,                       // context popup menu
         InputMethod = 83,                       // input method
-        AccessibilityPrepare = 86,              // accessibility information is requested
         TabletMove = 87,                        // Wacom tablet event
         LocaleChange = 88,                      // the system locale changed
         LanguageChange = 89,                    // the application language changed

diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index aa47616..e5b290a 100644 (file)
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -571,10 +571,6 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object)
     if (!object)
         return 0;
 
-    QEvent e(QEvent::AccessibilityPrepare);
-
-    QCoreApplication::sendEvent(object, &e);
-
     const QMetaObject *mo = object->metaObject();
     while (mo) {
         const QLatin1String cn(mo->className());

diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 095b58e..53f4942 100644 (file)
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -3124,7 +3124,6 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
         case QEvent::ChildRemoved:
         case QEvent::UpdateRequest:
         case QEvent::UpdateLater:
-        case QEvent::AccessibilityPrepare:
         case QEvent::LocaleChange:
         case QEvent::Style:
         case QEvent::IconDrag:

diff --git a/src/widgets/statemachine/qguistatemachine.cpp b/src/widgets/statemachine/qguistatemachine.cpp
index 465da1e..7c8de05 100644 (file)
--- a/src/widgets/statemachine/qguistatemachine.cpp
+++ b/src/widgets/statemachine/qguistatemachine.cpp
@@ -181,8 +181,6 @@ static QEvent *cloneEvent(QEvent *e)
 #endif
     case QEvent::InputMethod:
         return new QInputMethodEvent(*static_cast<QInputMethodEvent*>(e));
-    case QEvent::AccessibilityPrepare:
-        return new QEvent(*e);
     case QEvent::LocaleChange:
         return new QEvent(*e);
     case QEvent::LanguageChange:

diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index caf0f1f..dab9dd7 100644 (file)
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -5693,7 +5693,6 @@ private:
 void tst_QWidget::childEvents()
 {
     EventRecorder::EventList expected;
-    bool accessibilityEnabled = false;
 
     // Move away the cursor; otherwise it might result in an enter event if it's
     // inside the widget when the widget is shown.
@@ -5735,8 +5734,6 @@ void tst_QWidget::childEvents()
             << qMakePair(&widget, QEvent::Resize)
             << qMakePair(&widget, QEvent::Show);
 
-        if (accessibilityEnabled)
-            expected << qMakePair(&widget, QEvent::AccessibilityPrepare);
         expected << qMakePair(&widget, QEvent::ShowToParent);
         QCOMPARE(spy.eventList(), expected);
         spy.clear();
@@ -5820,8 +5817,6 @@ void tst_QWidget::childEvents()
             << qMakePair(&widget, QEvent::Resize)
             << qMakePair(&widget, QEvent::Show);
 
-        if (accessibilityEnabled)
-            expected << qMakePair(&widget, QEvent::AccessibilityPrepare);
         expected << qMakePair(&widget, QEvent::ShowToParent);
         QCOMPARE(spy.eventList(), expected);
         spy.clear();
@@ -5908,8 +5903,6 @@ void tst_QWidget::childEvents()
             << qMakePair(&widget, QEvent::Resize)
             << qMakePair(&widget, QEvent::Show);
 
-        if (accessibilityEnabled)
-            expected << qMakePair(&widget, QEvent::AccessibilityPrepare);
         expected << qMakePair(&widget, QEvent::ShowToParent);
         QCOMPARE(spy.eventList(), expected);
         spy.clear();