From 3b8d14055838610af0f284403d8b44bc37715062 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 23 Apr 2014 14:56:35 +0200 Subject: Accessibility: Do not report popup for QLineEdit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/plugins/accessible/widgets/simplewidgets.cpp | 4 ---- tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp index 646eeb06a1..a5365b2598 100644 --- a/src/plugins/accessible/widgets/simplewidgets.cpp +++ b/src/plugins/accessible/widgets/simplewidgets.cpp @@ -647,10 +647,6 @@ QAccessible::State QAccessibleLineEdit::state() const if (l->hasSelectedText()) state.selected = true; - if (l->contextMenuPolicy() != Qt::NoContextMenu - && l->contextMenuPolicy() != Qt::PreventContextMenu) - state.hasPopup = true; - return state; } diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index 1cc79f643a..54c56eb18b 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -1928,7 +1928,7 @@ void tst_QAccessibility::lineEditTest() QVERIFY(iface->state().movable); QVERIFY(iface->state().focusable); QVERIFY(iface->state().selectable); - QVERIFY(iface->state().hasPopup); + QVERIFY(!iface->state().hasPopup); QCOMPARE(bool(iface->state().focused), le->hasFocus()); QString secret(QLatin1String("secret")); @@ -1956,7 +1956,7 @@ void tst_QAccessibility::lineEditTest() QVERIFY(!(iface->state().movable)); QVERIFY(iface->state().focusable); QVERIFY(iface->state().selectable); - QVERIFY(iface->state().hasPopup); + QVERIFY(!iface->state().hasPopup); QCOMPARE(bool(iface->state().focused), le->hasFocus()); QLineEdit *le2 = new QLineEdit(toplevel); -- cgit v1.2.3