diff options
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/accessible/simplewidgets.cpp | 10 | ||||
-rw-r--r-- | src/widgets/accessible/simplewidgets_p.h | 1 | ||||
-rw-r--r-- | src/widgets/widgets/qlineedit.cpp | 6 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index efcf4cdc8b..716c833fc9 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -454,6 +454,13 @@ QAccessible::Role QAccessibleDisplay::role() const return QAccessibleWidget::role(); } +QAccessible::State QAccessibleDisplay::state() const +{ + QAccessible::State s = QAccessibleWidget::state(); + s.readOnly = true; + return s; +} + QString QAccessibleDisplay::text(QAccessible::Text t) const { QString str; @@ -732,10 +739,9 @@ QAccessible::State QAccessibleLineEdit::state() const QAccessible::State state = QAccessibleWidget::state(); QLineEdit *l = lineEdit(); + state.editable = true; if (l->isReadOnly()) state.readOnly = true; - else - state.editable = true; if (l->echoMode() != QLineEdit::Normal) state.passwordEdit = true; diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h index fcd0e7df47..73572e3059 100644 --- a/src/widgets/accessible/simplewidgets_p.h +++ b/src/widgets/accessible/simplewidgets_p.h @@ -116,6 +116,7 @@ public: QString text(QAccessible::Text t) const override; QAccessible::Role role() const override; + QAccessible::State state() const override; QVector<QPair<QAccessibleInterface*, QAccessible::Relation> >relations(QAccessible::Relation match = QAccessible::AllRelations) const override; void *interface_cast(QAccessible::InterfaceType t) override; diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 4301a3a2e7..86c7d35dbc 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -1369,6 +1369,12 @@ void QLineEdit::setReadOnly(bool enable) QEvent event(QEvent::ReadOnlyChange); QCoreApplication::sendEvent(this, &event); update(); +#ifndef QT_NO_ACCESSIBILITY + QAccessible::State changedState; + changedState.readOnly = true; + QAccessibleStateChangeEvent ev(this, changedState); + QAccessible::updateAccessibility(&ev); +#endif } } |