Stabilize test on X11

4 files changed, 8 insertions, 9 deletions

diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index 69c4c92..9f2e4e7 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -2846,11 +2846,11 @@ void tst_QAccessibility::mdiSubWindowTest()
     {
     QMdiArea mdiArea;
     mdiArea.show();
+    qApp->setActiveWindow(&mdiArea);
 #if defined(Q_WS_X11)
     qt_x11_wait_for_window_manager(&mdiArea);
-    QTest::qWait(100);
+    QTest::qWait(150);
 #endif
-    qApp->setActiveWindow(&mdiArea);
 
     bool isSubWindowsPlacedNextToEachOther = false;
     const int subWindowCount =  5;
diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index e55dc9aa..8459331 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -1705,7 +1705,7 @@ void tst_QGraphicsScene::hoverEvents_parentChild()
     view.scale(1.7, 1.7);
     view.show();
     QTest::qWaitForWindowShown(&view);
-    QTest::qWait(50);
+    QTest::qWait(70);
 
     QGraphicsSceneMouseEvent mouseEvent(QEvent::GraphicsSceneMouseMove);
     mouseEvent.setScenePos(QPointF(-1000, -1000));
@@ -1726,7 +1726,7 @@ void tst_QGraphicsScene::hoverEvents_parentChild()
             qApp->processEvents(); // this posts updates from the scene to the view
             qApp->processEvents(); // which trigger a repaint here
 
-            QVERIFY(items.at(i)->isHovered);
+            QTRY_VERIFY(items.at(i)->isHovered);
             if (i < 14)
                 QVERIFY(!items.at(i + 1)->isHovered);
             i += j ? 1 : -1;
diff --git a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
index 2d70bef..8258e15 100644
--- a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -1650,7 +1650,7 @@ void tst_QMdiSubWindow::resizeTimer()
     QMdiSubWindow *subWindow = mdiArea.addSubWindow(new QWidget);
     mdiArea.show();
     QTest::qWaitForWindowShown(&mdiArea);
-    QTest::qWait(250);
+    QTest::qWait(300);
 
 
     EventSpy timerEventSpy(subWindow, QEvent::Timer);
@@ -1663,7 +1663,7 @@ void tst_QMdiSubWindow::resizeTimer()
 
     QTest::qWait(500); // Wait for timer events to occur.
 
-    QVERIFY(timerEventSpy.count() > 0);
+    QTRY_VERIFY(timerEventSpy.count() > 0);
 }
 
 void tst_QMdiSubWindow::fixedMinMaxSize()
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index b0a26c2..a4e5d88 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -9024,12 +9024,11 @@ void tst_QWidget::taskQTBUG_4055_sendSyntheticEnterLeave()
  #ifdef Q_WS_X11
      qt_x11_wait_for_window_manager(&parent);
  #endif
-     QTest::qWait(100);
+     QTest::qWait(150);
 
      QCursor::setPos(child.mapToGlobal(QPoint(100, 100)));
-     QTest::qWait(100);
      // Make sure the cursor has entered the child.
-     QVERIFY(child.numEnterEvents > 0);
+     QTRY_VERIFY(child.numEnterEvents > 0);
 
      child.hide();
      child.reset();