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

 Conflicts:
	src/plugins/platforms/windows/qwindowsmousehandler.cpp
	src/plugins/platforms/xcb/qxcbimage.cpp
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/manual/qtabletevent/regular_widgets/main.cpp

Done-with: Friedemann Kleint<Friedemann.Kleint@qt.io>
Done-with: Mårten Nordheim<marten.nordheim@qt.io>
Change-Id: I5b2499513a92c590ed0756f7d2e93c35a64b7f30

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/manual/widgets/itemviews/qtreewidget/main.cpp b/tests/manual/widgets/itemviews/qtreewidget/main.cpp
index 5d129101fd..fb72c404a5 100644
--- a/tests/manual/widgets/itemviews/qtreewidget/main.cpp
+++ b/tests/manual/widgets/itemviews/qtreewidget/main.cpp
@@ -95,6 +95,18 @@ public:
         item5sl.append("Approver");
         /* QTreeWidgetItem *item4 =*/ new QTreeWidgetItem(item4, item5sl);
 
+        treeWidget->setDragEnabled(true);
+        treeWidget->viewport()->setAcceptDrops(true);
+        treeWidget->setDragDropMode(QAbstractItemView::InternalMove);
+
+        for (int u = 0; u < 12; ++u) {
+            const QString username = QString("Anonymous User %1").arg(u + 1);
+            QStringList info;
+            info << username << username << QString::number(u + 1) << QStringLiteral("Test user");
+            new QTreeWidgetItem(item4, info);
+        }
+
+        treeWidget->expandAll();
         treeWidget->setColumnCount(item2sl.size());
         QStringList itemInfo("First Name");
         itemInfo.append("Last Name");
@@ -133,6 +145,7 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     ExampleDlg d;
+    d.resize(d.sizeHint() * 3);
     d.show();
     app.exec();
 }