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

Conflicts:
	examples/network/network-chat/peermanager.cpp
	src/widgets/util/qsystemtrayicon.cpp
	src/widgets/util/qsystemtrayicon_qpa.cpp
	src/widgets/util/qsystemtrayicon_win.cpp
	src/widgets/util/qsystemtrayicon_x11.cpp

Change-Id: I1c026df83818c0ccaf956980370e7522960627db

1 files changed, 4 insertions, 5 deletions

diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 80ef0879cc..e2886cfcfe 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -3796,25 +3796,24 @@ void tst_QTreeView::task248022_changeSelection()
 void tst_QTreeView::task245654_changeModelAndExpandAll()
 {
     QTreeView view;
-    QStandardItemModel *model = new QStandardItemModel;
+    QScopedPointer<QStandardItemModel> model(new QStandardItemModel);
     QStandardItem *top = new QStandardItem("top");
     QStandardItem *sub = new QStandardItem("sub");
     top->appendRow(sub);
     model->appendRow(top);
-    view.setModel(model);
+    view.setModel(model.data());
     view.expandAll();
     QApplication::processEvents();
     QVERIFY(view.isExpanded(top->index()));
 
     //now let's try to delete the model
     //then repopulate and expand again
-    delete model;
-    model = new QStandardItemModel;
+    model.reset(new QStandardItemModel);
     top = new QStandardItem("top");
     sub = new QStandardItem("sub");
     top->appendRow(sub);
     model->appendRow(top);
-    view.setModel(model);
+    view.setModel(model.data());
     view.expandAll();
     QApplication::processEvents();
     QVERIFY(view.isExpanded(top->index()));