diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-04 14:45:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-04 14:45:46 +0200 |
| commit | 6dd8ac17197a501fbad58c4468b1dd9a64a3fec8 (patch) | |
| tree | 913181de10c71d5616e403a407dd25d0c8809077 /tests/auto/accessibility/tst_accessibility.cpp | |
| parent | b784d232b2f3de4624ae6dd28c3f74eeb08b2e79 (diff) | |
| parent | fa0a2860e9ca7bb035fec21ceb0dfe919c7d0dca (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: Ib55ecb95e5ae47cc7a46f136a2f2eb158676ea34
Diffstat (limited to 'tests/auto/accessibility/tst_accessibility.cpp')
| -rw-r--r-- | tests/auto/accessibility/tst_accessibility.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/accessibility/tst_accessibility.cpp b/tests/auto/accessibility/tst_accessibility.cpp index 32803d7d..0c2f2e74 100644 --- a/tests/auto/accessibility/tst_accessibility.cpp +++ b/tests/auto/accessibility/tst_accessibility.cpp @@ -100,7 +100,7 @@ void tst_accessibility::a11y_data() QTest::newRow("StackView") << "stackview" << QAccessible::LayeredPane << ""; QTest::newRow("SwipeDelegate") << "swipedelegate" << QAccessible::ListItem << "SwipeDelegate"; QTest::newRow("SwipeView") << "swipeview" << QAccessible::PageTabList << ""; - QTest::newRow("Switch") << "switch" << QAccessible::Button << "Switch"; + QTest::newRow("Switch") << "switch" << QAccessible::CheckBox << "Switch"; QTest::newRow("SwitchDelegate") << "switchdelegate" << QAccessible::ListItem << "SwitchDelegate"; QTest::newRow("TabBar") << "tabbar" << QAccessible::PageTabList << ""; QTest::newRow("TabButton") << "tabbutton" << QAccessible::PageTab << "TabButton"; @@ -109,7 +109,7 @@ void tst_accessibility::a11y_data() QTest::newRow("ToolBar") << "toolbar" << QAccessible::ToolBar << ""; QTest::newRow("ToolButton") << "toolbutton" << QAccessible::Button << "ToolButton"; QTest::newRow("ToolTip") << "tooltip" << QAccessible::ToolTip << "ToolTip"; - QTest::newRow("Tumbler") << "tumbler" << QAccessible::NoRole << ""; // (TODO) + QTest::newRow("Tumbler") << "tumbler" << QAccessible::NoRole << ""; // TODO QTest::newRow("DayOfWeekRow") << "dayofweekrow" << QAccessible::NoRole << "DayOfWeekRow"; QTest::newRow("MonthGrid") << "monthgrid" << QAccessible::NoRole << "MonthGrid"; |