Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: Ibe5b4aa249863a54007180f3684dc5ce1b23cb7b

1 files changed, 2 insertions, 0 deletions

diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 8396fd4ec7..7259fa1ab0 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -976,6 +976,7 @@ void tst_QTreeView::indexWidget()
     QStandardItemModel treeModel;
     initStandardTreeModel(&treeModel);
     view.setModel(&treeModel);
+    view.resize(300, 400);  // make sure the width of the view is larger than the widgets below
 
     QModelIndex index = view.model()->index(0, 0);
 
@@ -1004,6 +1005,7 @@ void tst_QTreeView::indexWidget()
 
     //now let's try to do that later when the widget is already shown
     view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
     index = view.model()->index(1, 0);
     QVERIFY(!view.indexWidget(index));