Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I2811ff0b9d4097f0be60ff16e9664a5060cff23e

1 files changed, 7 insertions, 6 deletions

diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index cacc0d80f9..d3c9aa87ef 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -1670,13 +1670,10 @@ void tst_QAccessibility::spinBoxTest()
     QCOMPARE(accessibleRect, widgetRect);
     QCOMPARE(interface->text(QAccessible::Value), QLatin1String("3"));
 
-    // one child, the line edit
+    // make sure that the line edit is not there
     const int numChildren = interface->childCount();
-    QCOMPARE(numChildren, 1);
-    QAccessibleInterface *lineEdit = interface->child(0);
-
-    QCOMPARE(lineEdit->role(), QAccessible::EditableText);
-    QCOMPARE(lineEdit->text(QAccessible::Value), QLatin1String("3"));
+    QCOMPARE(numChildren, 0);
+    QVERIFY(interface->child(0) == Q_NULLPTR);
 
     QVERIFY(interface->valueInterface());
     QCOMPARE(interface->valueInterface()->currentValue().toInt(), 3);
@@ -1690,6 +1687,10 @@ void tst_QAccessibility::spinBoxTest()
     QTest::qWait(200);
     QAccessibleValueChangeEvent expectedEvent(spinBox, spinBox->value());
     QVERIFY(QTestAccessibility::containsEvent(&expectedEvent));
+
+    QAccessibleTextInterface *textIface = interface->textInterface();
+    QVERIFY(textIface);
+
     delete spinBox;
     QTestAccessibility::clearEvents();
 }