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

 Conflicts:
	examples/network/bearermonitor/CMakeLists.txt
	examples/network/CMakeLists.txt
	src/corelib/tools/qlinkedlist.h
	src/sql/kernel/qsqldriver_p.h
	src/sql/kernel/qsqlresult_p.h
	src/widgets/kernel/qwidget.cpp
	src/widgets/kernel/qwidget_p.h
	tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json

Change-Id: I21a3c34570ae79ea9d30107fae71759d7eac17d9

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));