Try to make test more robust.

By using QTRY_{COMPARE,VERIFY} instead of waiting an arbitrary amount of
time waiting for the window manager to do his job.

Also use QApplication::setActiveWindow which seems to be more robust
then QWidget::activateWindow

1 files changed, 3 insertions, 2 deletions

diff --git a/tests/auto/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/qabstractbutton/tst_qabstractbutton.cpp
index de2d9f4..7ee52ad 100644
--- a/tests/auto/qabstractbutton/tst_qabstractbutton.cpp
+++ b/tests/auto/qabstractbutton/tst_qabstractbutton.cpp
@@ -550,6 +550,7 @@ void tst_QAbstractButton::setShortcut()
 {
     QKeySequence seq( Qt::Key_A );
     testWidget->setShortcut( seq );
+    QApplication::setActiveWindow(testWidget);
 
     // must be active to get shortcuts
     for (int i = 0; !testWidget->isActiveWindow() && i < 100; ++i) {
@@ -557,8 +558,8 @@ void tst_QAbstractButton::setShortcut()
        QApplication::instance()->processEvents();
        QTest::qWait(100);
     }
-    QVERIFY(testWidget->isActiveWindow());    
-    
+    QVERIFY(testWidget->isActiveWindow());
+
     QTest::keyClick( testWidget, 'A' );
     QTest::qWait(300);                      // Animate click takes time
     QCOMPARE(click_count,  (uint)1);