aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/accessibility
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-11-20 14:26:47 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-11-20 17:23:42 +0000
commit67398f037ebf9b36b88e870998eea5918832db2c (patch)
tree5e16e2d1dca676dc865aafe04bdc1c86e92d929a /tests/auto/accessibility
parent6ca831b18f361924cab39b65d1a1e8b31e60b3fc (diff)
Fix accessibility initialization
If accessibility is already enabled at construction time, QQuickControl does not get a notification of accessibility activation change. This patch fixes the issue that the attached property object was not created at all, by calling accessibilityActiveChange(true) when appropriate at component completion. Change-Id: I5d763d66c97a540687b217b8ae453d073f6bfdb4 Task-number: QTBUG-49361 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'tests/auto/accessibility')
-rw-r--r--tests/auto/accessibility/tst_accessibility.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/auto/accessibility/tst_accessibility.cpp b/tests/auto/accessibility/tst_accessibility.cpp
index a9e04d59..866d3b13 100644
--- a/tests/auto/accessibility/tst_accessibility.cpp
+++ b/tests/auto/accessibility/tst_accessibility.cpp
@@ -135,9 +135,13 @@ void tst_accessibility::a11y()
if (name != QLatin1Literal("dayofweekrow")
&& name != QLatin1Literal("monthgrid")
&& name != QLatin1Literal("weeknumbercolumn")) {
- QVERIFY(!acc);
- QAccessible::setActive(true);
- acc = qobject_cast<QQuickAccessibleAttached *>(qmlAttachedPropertiesObject<QQuickAccessibleAttached>(item, false));
+ if (QAccessible::isActive()) {
+ QVERIFY(acc);
+ } else {
+ QVERIFY(!acc);
+ QAccessible::setActive(true);
+ acc = qobject_cast<QQuickAccessibleAttached *>(qmlAttachedPropertiesObject<QQuickAccessibleAttached>(item, false));
+ }
}
QVERIFY(acc);
QCOMPARE(acc->role(), (QAccessible::Role)role);