1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accessibility: Do not report popup for QLineEdit

Browse Source 
Nothing else seems to report this state and on windows
for example it results in NVDA reading subMenu which makes
little sense.
Task-number: QTBUG-38500
Change-Id: I64820d9f2ea9174034f01da42cb2266a19c19465
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
This commit is contained in:
Frederik Gladhorn 2014-04-23 14:56:35 +02:00 committed by The Qt Project
parent d36002d046
commit 3b8d140558
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/accessible/widgets/simplewidgets.cpp
View File

@ -647,10 +647,6 @@ QAccessible::State QAccessibleLineEdit::state() const
if (l->hasSelectedText()) if (l->hasSelectedText())
state.selected = true; state.selected = true;
if (l->contextMenuPolicy() != Qt::NoContextMenu
&& l->contextMenuPolicy() != Qt::PreventContextMenu)
state.hasPopup = true;
return state; return state;
} }

4
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
View File

@ -1928,7 +1928,7 @@ void tst_QAccessibility::lineEditTest()
QVERIFY(iface->state().movable); QVERIFY(iface->state().movable);
QVERIFY(iface->state().focusable); QVERIFY(iface->state().focusable);
QVERIFY(iface->state().selectable); QVERIFY(iface->state().selectable);
QVERIFY(iface->state().hasPopup); QVERIFY(!iface->state().hasPopup);
QCOMPARE(bool(iface->state().focused), le->hasFocus()); QCOMPARE(bool(iface->state().focused), le->hasFocus());
QString secret(QLatin1String("secret")); QString secret(QLatin1String("secret"));
@ -1956,7 +1956,7 @@ void tst_QAccessibility::lineEditTest()
QVERIFY(!(iface->state().movable)); QVERIFY(!(iface->state().movable));
QVERIFY(iface->state().focusable); QVERIFY(iface->state().focusable);
QVERIFY(iface->state().selectable); QVERIFY(iface->state().selectable);
QVERIFY(iface->state().hasPopup); QVERIFY(!iface->state().hasPopup);
QCOMPARE(bool(iface->state().focused), le->hasFocus()); QCOMPARE(bool(iface->state().focused), le->hasFocus());
QLineEdit *le2 = new QLineEdit(toplevel); QLineEdit *le2 = new QLineEdit(toplevel);