diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-08-22 10:35:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-22 10:35:12 +0200 |
| commit | 7533156b689c63fa26d66b3e6bacc598cb58456c (patch) | |
| tree | 99a535c86e26284e807cd70e9af9a616b79bceaa /src/plugins/platforms/windows | |
| parent | 07eda676e45f6c3c7237581c3f4a9e39695697ab (diff) | |
| parent | 76c328b2b39617310993ce76e65665943b8c111c (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/gui/text/qtextengine.cpp
tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h
Change-Id: Ib9f968edbb0f3387c89bc25e914321d0738bfadc
Diffstat (limited to 'src/plugins/platforms/windows')
| -rw-r--r-- | src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp index 11397fb9ec..7a91c3d4e2 100644 --- a/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp +++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp @@ -180,7 +180,7 @@ long roleToControlTypeId(QAccessible::Role role) {QAccessible::PropertyPage, UIA_CustomControlTypeId}, {QAccessible::Indicator, UIA_CustomControlTypeId}, {QAccessible::Graphic, UIA_ImageControlTypeId}, - {QAccessible::StaticText, UIA_EditControlTypeId}, + {QAccessible::StaticText, UIA_TextControlTypeId}, {QAccessible::EditableText, UIA_EditControlTypeId}, {QAccessible::Button, UIA_ButtonControlTypeId}, {QAccessible::CheckBox, UIA_CheckBoxControlTypeId}, |