3 files changed, 15 insertions, 13 deletions
diff --git a/src/plugins/accessible/widgets/complexwidgets.h b/src/plugins/accessible/widgets/complexwidgets.h
index 980eee2502..13fe9beb9f 100644
--- a/src/plugins/accessible/widgets/complexwidgets.h
+++ b/src/plugins/accessible/widgets/complexwidgets.h
@@ -250,7 +250,7 @@ protected:
 #endif // QT_NO_TABBAR
 
 #ifndef QT_NO_COMBOBOX
-class QAccessibleComboBox : public QAccessibleWidget, public QAccessibleActionInterface
+class QAccessibleComboBox : public QAccessibleWidget
 {
     Q_ACCESSIBLE_OBJECT
 public:
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);
diff --git a/src/plugins/accessible/widgets/simplewidgets.h b/src/plugins/accessible/widgets/simplewidgets.h
index 252d994d1b..8642f8d9b9 100644
--- a/src/plugins/accessible/widgets/simplewidgets.h
+++ b/src/plugins/accessible/widgets/simplewidgets.h
@@ -55,7 +55,7 @@ class QLineEdit;
 class QToolButton;
 class QProgressBar;
 
-class QAccessibleButton : public QAccessibleWidget, public QAccessibleActionInterface
+class QAccessibleButton : public QAccessibleWidget
 {
     Q_ACCESSIBLE_OBJECT
     Q_DECLARE_TR_FUNCTIONS(QAccessibleButton)