diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-08 20:31:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-08 20:31:31 +0200 |
| commit | 9cfdd66b6452704349b5f986f31b7f1f03748cb5 (patch) | |
| tree | f23fcc32c0da325402ab9be3da144525d4823f9b /src/widgets/accessible | |
| parent | 167782691678d6b1588d875036097fadaaced829 (diff) | |
| parent | 1326cd15f7ba985551f0fddc717e3bfc01ddda85 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/accessible')
| -rw-r--r-- | src/widgets/accessible/complexwidgets.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index 34af9d4d0c..3b7ff2ea26 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -325,19 +325,19 @@ QString QAccessibleComboBox::text(QAccessible::Text t) const QStringList QAccessibleComboBox::actionNames() const { - return QStringList(showMenuAction()); + return QStringList() << showMenuAction() << pressAction(); } QString QAccessibleComboBox::localizedActionDescription(const QString &actionName) const { - if (actionName == showMenuAction()) + if (actionName == showMenuAction() || actionName == pressAction()) return QComboBox::tr("Open the combo box selection popup"); return QString(); } void QAccessibleComboBox::doAction(const QString &actionName) { - if (actionName == showMenuAction()) { + if (actionName == showMenuAction() || actionName == pressAction()) { if (comboBox()->view()->isVisible()) { comboBox()->hidePopup(); } else { |