diff options
| author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2011-10-11 16:20:47 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-27 11:12:38 +0200 |
| commit | 5aa14793c422dc77f3b464c27091dcd1b2ed1c72 (patch) | |
| tree | 8a167a67e5d1456a774e176db31a627d0a89cd33 /src/plugins/accessible/widgets/simplewidgets.cpp | |
| parent | 8f912c5c0f3f89e6f3042c0a948ccd155e57e216 (diff) | |
Add default actions to QAccessibleWidget.
Change-Id: I9f251aad663fd0b8db2ef068c6581241d91c090d
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/plugins/accessible/widgets/simplewidgets.cpp')
| -rw-r--r-- | src/plugins/accessible/widgets/simplewidgets.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp index 4771d93980..d2c5256b19 100644 --- a/src/plugins/accessible/widgets/simplewidgets.cpp +++ b/src/plugins/accessible/widgets/simplewidgets.cpp @@ -187,6 +187,7 @@ QStringList QAccessibleButton::actionNames() const break; } } + names << QAccessibleWidget::actionNames(); return names; } @@ -203,12 +204,13 @@ void QAccessibleButton::doAction(const QString &actionName) else #endif button()->animateClick(); - } - - if (actionName == CheckAction) + } else if (actionName == CheckAction) { button()->setChecked(true); - if (actionName == UncheckAction) + } else if (actionName == UncheckAction) { button()->setChecked(false); + } else { + QAccessibleWidget::doAction(actionName); + } } QStringList QAccessibleButton::keyBindingsForAction(const QString &actionName) const @@ -456,10 +458,10 @@ QAccessible::Relation QAccessibleDisplay::relationTo(int child, const QAccessibl #endif #ifndef QT_NO_GROUPBOX } else { - QGroupBox *groupbox = qobject_cast<QGroupBox*>(object()); - if (groupbox && !groupbox->title().isEmpty()) - if (groupbox->children().contains(o)) - relation |= Label; + QGroupBox *groupbox = qobject_cast<QGroupBox*>(object()); + if (groupbox && !groupbox->title().isEmpty()) + if (groupbox->children().contains(o)) + relation |= Label; #endif } return relation; @@ -478,9 +480,9 @@ int QAccessibleDisplay::navigate(RelationFlag rel, int entry, QAccessibleInterfa #endif #ifndef QT_NO_GROUPBOX } else { - QGroupBox *groupbox = qobject_cast<QGroupBox*>(object()); - if (groupbox && !groupbox->title().isEmpty()) - rel = Child; + QGroupBox *groupbox = qobject_cast<QGroupBox*>(object()); + if (groupbox && !groupbox->title().isEmpty()) + rel = Child; #endif } *target = QAccessible::queryAccessibleInterface(targetObject); |