diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-09 01:00:17 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-09 09:31:24 +0200 |
commit | 90f85482bb0499a55993b94743266fedf4cefef1 (patch) | |
tree | a97a45390ace4b284d80a506e76d2e58bb24d29c /src/quick/items/qquickaccessibleattached_p.h | |
parent | ae8c798a0a01334d1af33a59acdaeda8898a9f5c (diff) | |
parent | 0a775ded35acf7172e3f852d55de7e28a5370653 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/compiler/qqmlirbuilder.cpp
Change-Id: I2cfda470515e2df778ad3c89105c07344af07c6d
Diffstat (limited to 'src/quick/items/qquickaccessibleattached_p.h')
-rw-r--r-- | src/quick/items/qquickaccessibleattached_p.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h index 215a1e5db6..e292c280df 100644 --- a/src/quick/items/qquickaccessibleattached_p.h +++ b/src/quick/items/qquickaccessibleattached_p.h @@ -128,13 +128,19 @@ public: case QAccessible::Button: case QAccessible::MenuItem: case QAccessible::PageTab: - case QAccessible::EditableText: case QAccessible::SpinBox: case QAccessible::ComboBox: case QAccessible::Terminal: case QAccessible::ScrollBar: m_state.focusable = true; break; + case QAccessible::EditableText: + m_state.editable = true; + m_state.focusable = true; + break; + case QAccessible::StaticText: + m_state.readOnly = true; + break; default: break; } |