summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-07-18 09:53:18 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-09 13:48:03 (GMT)
commitee6f4a1157eb02f0807ba77847d87a02205abdc3 (patch)
tree54a72d6b2ae90834bf113c6c84e92408191f9f40 /src/plugins
parentf35072ddd8e66862b1e5240276e86029e08b290b (diff)
downloadQt-ee6f4a1157eb02f0807ba77847d87a02205abdc3.zip
Qt-ee6f4a1157eb02f0807ba77847d87a02205abdc3.tar.gz
Qt-ee6f4a1157eb02f0807ba77847d87a02205abdc3.tar.bz2
Accessibility: ComboBoxes should expose their line edits as text
Change-Id: I6617635544c5b77f3768df949589bb91d08db33c Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/accessible/widgets/complexwidgets.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp
index 4881f1f..22d6eaf 100644
--- a/src/plugins/accessible/widgets/complexwidgets.cpp
+++ b/src/plugins/accessible/widgets/complexwidgets.cpp
@@ -1780,9 +1780,12 @@ int QAccessibleComboBox::navigate(RelationFlag rel, int entry, QAccessibleInterf
*target = 0;
if (entry > ComboBoxSelf) switch (rel) {
case Child:
- if (entry < PopupList)
+ if (entry == CurrentText && comboBox()->isEditable()) {
+ *target = QAccessible::queryAccessibleInterface(comboBox()->lineEdit());
+ return *target ? 0 : -1;
+ } else if (entry < PopupList) {
return entry;
- if (entry == PopupList) {
+ } else if (entry == PopupList) {
QAbstractItemView *view = comboBox()->view();
QWidget *parent = view ? view->parentWidget() : 0;
*target = QAccessible::queryAccessibleInterface(parent);