AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove AccessibilityPrepare event.

Browse Source 
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>
This commit is contained in:
Frederik Gladhorn 2012-02-12 12:35:12 +01:00 committed by Qt by Nokia
parent b7ba685150
commit f449cefc27
5 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/kernel/qcoreevent.h
View File

@ -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

4
src/gui/accessible/qaccessible.cpp
View File

@ -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());

1
src/widgets/kernel/qapplication.cpp
View File

@ -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:

2
src/widgets/statemachine/qguistatemachine.cpp
View File

@ -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:

7
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -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();