From a5ab9a3beacd981bdd3c8f84b0eab14e94beb228 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Wed, 30 Apr 2014 22:31:37 +0200
Subject: [PATCH 05/12] Improve test stability

---
 tests/auto/tst_accessibilityclient.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/auto/tst_accessibilityclient.cpp b/tests/auto/tst_accessibilityclient.cpp
index 2fcb856..3aaa892 100644
--- a/tests/auto/tst_accessibilityclient.cpp
+++ b/tests/auto/tst_accessibilityclient.cpp
@@ -178,10 +178,12 @@ void AccessibilityClientTest::tst_navigation()
     QString desc = "This is a button...";
     button->setAccessibleDescription(desc);
     w.show();
+    w.activateWindow();
     button->setFocus();
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
     QTest::qWaitForWindowExposed(&w);
+    QTest::qWaitForWindowActive(&w);
 #else
     QTest::qWaitForWindowShown(&w);
 #endif
@@ -253,7 +255,9 @@ void AccessibilityClientTest::tst_navigation()
     QVERIFY(!accLabel.isChecked());
     QVERIFY(!accLabel.isFocusable());
     QVERIFY(!accLabel.isFocused());
+#if (QT_VERSION < QT_VERSION_CHECK(5, 2, 1))
     QEXPECT_FAIL("", "Labels in Qt 4 report themselves as editable.", Continue);
+#endif
     QVERIFY(!accLabel.isEditable());
 
     AccessibleObject accLine = accW.child(2);
-- 
2.9.4