1 files changed, 17 insertions, 24 deletions

diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 37402d8a58..a58202e636 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -3466,6 +3466,7 @@ void tst_QTreeView::addRowsWhileSectionsAreHidden()
         QStandardItemModel *model = new QStandardItemModel(6, pass, &view);
         view.setModel(model);
         view.show();
+        QVERIFY(QTest::qWaitForWindowActive(&view));
 
         int i;
         for (i = 0; i < 3; ++i)
@@ -3489,12 +3490,15 @@ void tst_QTreeView::addRowsWhileSectionsAreHidden()
         }
         for (col = 0; col < pass; ++col)
             view.setColumnHidden(col, false);
-        QTest::qWait(250);
 
-        for (i = 0; i < 6; ++i) {
-            QRect rect = view.visualRect(model->index(i, 0));
-            QCOMPARE(rect.isValid(), true);
-        }
+        auto allVisualRectsValid = [](QTreeView *view, QStandardItemModel *model) {
+            for (int i = 0; i < 6; ++i) {
+                if (!view->visualRect(model->index(i, 0)).isValid())
+                    return false;
+            }
+            return true;
+        };
+        QTRY_VERIFY(allVisualRectsValid(&view, model));
 
         delete model;
     }
@@ -3517,11 +3521,9 @@ void tst_QTreeView::task216717_updateChildren()
     tree.refreshed = false;
     QTreeWidgetItem *parent = new QTreeWidgetItem(QStringList() << "parent");
     tree.addTopLevelItem(parent);
-    QTest::qWait(10);
     QTRY_VERIFY(tree.refreshed);
     tree.refreshed = false;
     parent->addChild(new QTreeWidgetItem(QStringList() << "child"));
-    QTest::qWait(10);
     QTRY_VERIFY(tree.refreshed);
 
 }
@@ -3555,11 +3557,10 @@ void tst_QTreeView::task220298_selectColumns()
     Model model;
     view.setModel(&model);
     view.show();
-    QTest::qWait(50);
+    QVERIFY(QTest::qWaitForWindowActive(&view));
     QTest::mouseClick(view.viewport(), Qt::LeftButton, 0,
                       view.visualRect(view.model()->index(1, 1)).center());
-    QTest::qWait(50);
-    QVERIFY(view.selectedIndexes().contains(view.model()->index(1, 2)));
+    QTRY_VERIFY(view.selectedIndexes().contains(view.model()->index(1, 2)));
     QVERIFY(view.selectedIndexes().contains(view.model()->index(1, 1)));
     QVERIFY(view.selectedIndexes().contains(view.model()->index(1, 0)));
 }
@@ -3577,15 +3578,14 @@ void tst_QTreeView::task224091_appendColumns()
     qApp->setActiveWindow(topLevel);
     QVERIFY(QTest::qWaitForWindowActive(topLevel));
 
+    QVERIFY(!treeView->verticalScrollBar()->isVisible());
+
     QList<QStandardItem *> projlist;
     for (int k = 0; k < 10; ++k)
         projlist.append(new QStandardItem(QLatin1String("Top Level ") + QString::number(k)));
     model->appendColumn(projlist);
     model->invisibleRootItem()->appendRow(new QStandardItem("end"));
 
-    QTest::qWait(50);
-    qApp->processEvents();
-
     QTRY_VERIFY(treeView->verticalScrollBar()->isVisible());
 
     delete topLevel;
@@ -3743,11 +3743,10 @@ void tst_QTreeView::task238873_avoidAutoReopening()
     view.setModel(&model);
     view.show();
     view.expandAll();
-    QTest::qWait(100);
+    QVERIFY(QTest::qWaitForWindowActive(&view));
 
     QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.visualRect(child.index()).center());
-    QTest::qWait(20);
-    QCOMPARE(view.currentIndex(), child.index());
+    QTRY_COMPARE(view.currentIndex(), child.index());
 
     view.setExpanded(item1.index(), false);
 
@@ -3812,7 +3811,6 @@ void tst_QTreeView::task246536_scrollbarsNotWorking()
     QTest::qWait(100);
     o.count = 0;
     tree.verticalScrollBar()->setValue(50);
-    QTest::qWait(100);
     QTRY_VERIFY(o.count > 0);
 }
 
@@ -3828,7 +3826,7 @@ void tst_QTreeView::task250683_wrongSectionSize()
     treeView.setColumnHidden(3, true);
 
     treeView.show();
-    QTest::qWait(100);
+    QVERIFY(QTest::qWaitForWindowActive(&treeView));
 
     QCOMPARE(treeView.header()->sectionSize(0) + treeView.header()->sectionSize(1), treeView.viewport()->width());
 }
@@ -3865,7 +3863,6 @@ void tst_QTreeView::task239271_addRowsWithFirstColumnHidden()
     QStandardItem sub1("sub1"), sub11("sub11");
     root0.appendRow(QList<QStandardItem*>() << &sub1 << &sub11);
 
-    QTest::qWait(20);
     //items in the 2nd column should have been painted
     QTRY_VERIFY(!delegate.paintedIndexes.isEmpty());
     QVERIFY(delegate.paintedIndexes.contains(sub00.index()));
@@ -3978,7 +3975,6 @@ void tst_QTreeView::doubleClickedWithSpans()
 
     //end the previous edition
     QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, p);
-    QTest::qWait(150);
     QTest::mousePress(view.viewport(), Qt::LeftButton, 0, p);
     QTest::mouseDClick(view.viewport(), Qt::LeftButton, 0, p);
     QTest::mouseRelease(view.viewport(), Qt::LeftButton, 0, p);
@@ -4043,7 +4039,6 @@ void tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint()
     view.painted = 0;
     view.doCompare = true;
     model.setData(model.index(0, 0), QVariant(QSize(50, 50)), Qt::SizeHintRole);
-    QTest::qWait(100);
     QTRY_VERIFY(view.painted > 0);
 }
 
@@ -4251,7 +4246,6 @@ void tst_QTreeView::taskQTBUG_11466_keyboardNavigationRegression()
     QVERIFY(QTest::qWaitForWindowExposed(&treeView));
 
     QTest::keyPress(treeView.viewport(), Qt::Key_Down);
-    QTest::qWait(10);
     QTRY_COMPARE(treeView.currentIndex(), treeView.selectionModel()->selection().indexes().first());
 }
 
@@ -4271,8 +4265,7 @@ void tst_QTreeView::taskQTBUG_13567_removeLastItemRegression()
 
     view.setCurrentIndex(model.index(199, 0));
     model.removeLastRow();
-    QTest::qWait(10);
-    QCOMPARE(view.currentIndex(), model.index(198, 0));
+    QTRY_COMPARE(view.currentIndex(), model.index(198, 0));
     CHECK_VISIBLE(198, 0);
 }