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

4 files changed, 54 insertions, 30 deletions

diff --git a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp
index 99e3d148df..f5c3bfde34 100644
--- a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp
+++ b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp
@@ -156,7 +156,7 @@ void tst_NetworkRemoteStressTest::clearManager()
 
 bool nativeLookup(const char *hostname, int port, QByteArray &buf)
 {
-#if !defined(QT_NO_GETADDRINFO) && 0
+#if 0
     addrinfo *res = 0;
     struct addrinfo hints;
     memset(&hints, 0, sizeof(hints));
diff --git a/tests/manual/network_stresstest/tst_network_stresstest.cpp b/tests/manual/network_stresstest/tst_network_stresstest.cpp
index d46703c671..03df1633d5 100644
--- a/tests/manual/network_stresstest/tst_network_stresstest.cpp
+++ b/tests/manual/network_stresstest/tst_network_stresstest.cpp
@@ -147,7 +147,7 @@ void tst_NetworkStressTest::clearManager()
 
 bool nativeLookup(const char *hostname, int port, QByteArray &buf)
 {
-#if !defined(QT_NO_GETADDRINFO) && 0
+#if 0
     addrinfo *res = 0;
     struct addrinfo hints;
     memset(&hints, 0, sizeof(hints));
diff --git a/tests/manual/qtabletevent/regular_widgets/main.cpp b/tests/manual/qtabletevent/regular_widgets/main.cpp
index 891d7bcab6..caf8c70c6f 100644
--- a/tests/manual/qtabletevent/regular_widgets/main.cpp
+++ b/tests/manual/qtabletevent/regular_widgets/main.cpp
@@ -59,6 +59,25 @@ struct TabletPoint
     qreal angle;
 };
 
+class ProximityEventFilter : public QObject
+{
+public:
+    explicit ProximityEventFilter(QObject *parent) : QObject(parent) { }
+
+    bool eventFilter(QObject *, QEvent *event) override
+    {
+        switch (event->type()) {
+        case QEvent::TabletEnterProximity:
+        case QEvent::TabletLeaveProximity:
+            qDebug() << event;
+            break;
+        default:
+            break;
+        }
+        return false;
+    }
+};
+
 class EventReportWidget : public QWidget
 {
     Q_OBJECT
@@ -69,39 +88,34 @@ public slots:
     void clearPoints() { m_points.clear(); update(); }
 
 signals:
-    void stats(QString s);
+    void stats(QString s, int timeOut = 0);
 
 protected:
-    void mouseDoubleClickEvent(QMouseEvent *event) { outputMouseEvent(event); }
-    void mouseMoveEvent(QMouseEvent *event) { outputMouseEvent(event); }
-    void mousePressEvent(QMouseEvent *event) { outputMouseEvent(event); }
-    void mouseReleaseEvent(QMouseEvent *event) { outputMouseEvent(event); }
+    void mouseDoubleClickEvent(QMouseEvent *event) override { outputMouseEvent(event); }
+    void mouseMoveEvent(QMouseEvent *event) override { outputMouseEvent(event); }
+    void mousePressEvent(QMouseEvent *event) override { outputMouseEvent(event); }
+    void mouseReleaseEvent(QMouseEvent *event) override { outputMouseEvent(event); }
 
-    void tabletEvent(QTabletEvent *);
+    void tabletEvent(QTabletEvent *) override;
 
-    bool event(QEvent *event);
+    bool event(QEvent *event) override;
 
-    void paintEvent(QPaintEvent *);
-    void timerEvent(QTimerEvent *);
+    void paintEvent(QPaintEvent *) override;
+    void timerEvent(QTimerEvent *) override;
 
 private:
     void outputMouseEvent(QMouseEvent *event);
 
-    bool m_lastIsMouseMove;
-    bool m_lastIsTabletMove;
-    Qt::MouseButton m_lastButton;
+    bool m_lastIsMouseMove = false;
+    bool m_lastIsTabletMove = false;
+    Qt::MouseButton m_lastButton = Qt::NoButton;
     QVector<TabletPoint> m_points;
     QVector<QPointF> m_touchPoints;
-    int m_tabletMoveCount;
-    int m_paintEventCount;
+    int m_tabletMoveCount = 0;
+    int m_paintEventCount = 0;
 };
 
 EventReportWidget::EventReportWidget()
-    : m_lastIsMouseMove(false)
-    , m_lastIsTabletMove(false)
-    , m_lastButton(Qt::NoButton)
-    , m_tabletMoveCount(0)
-    , m_paintEventCount(0)
 {
     setAttribute(Qt::WA_AcceptTouchEvents);
     startTimer(1000);
@@ -118,7 +132,7 @@ void EventReportWidget::paintEvent(QPaintEvent *)
     p.setPen(Qt::white);
     QPainterPath ellipse;
     ellipse.addEllipse(0, 0, halfLineSpacing * 5, halfLineSpacing);
-    foreach (const TabletPoint &t, m_points) {
+    for (const TabletPoint &t : qAsConst(m_points)) {
         if (geom.contains(t.pos)) {
               QPainterPath pp;
               pp.addEllipse(t.pos, halfLineSpacing, halfLineSpacing);
@@ -168,10 +182,6 @@ void EventReportWidget::tabletEvent(QTabletEvent *event)
     QWidget::tabletEvent(event);
     bool isMove = false;
     switch (event->type()) {
-    case QEvent::TabletEnterProximity:
-    case QEvent::TabletLeaveProximity:
-        qDebug() << "proximity" << event;
-        break;
     case QEvent::TabletMove:
         m_points.push_back(TabletPoint(event->pos(), TabletMove, m_lastButton, event->pointerType(), event->pressure(), event->rotation()));
         update();
@@ -243,15 +253,16 @@ void EventReportWidget::timerEvent(QTimerEvent *)
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
+    app.installEventFilter(new ProximityEventFilter(&app));
     QMainWindow mainWindow;
     mainWindow.setWindowTitle(QString::fromLatin1("Tablet Test %1").arg(QT_VERSION_STR));
     EventReportWidget *widget = new EventReportWidget;
     widget->setMinimumSize(640, 480);
     QMenu *fileMenu = mainWindow.menuBar()->addMenu("File");
-    QObject::connect(fileMenu->addAction("Clear"), SIGNAL(triggered()), widget, SLOT(clearPoints()));
-    QObject::connect(widget, SIGNAL(stats(QString)), mainWindow.statusBar(), SLOT(showMessage(QString)));
-    QAction *quitAction = fileMenu->addAction("Quit");
-    QObject::connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    fileMenu->addAction("Clear", widget, &EventReportWidget::clearPoints);
+    QObject::connect(widget, &EventReportWidget::stats,
+                     mainWindow.statusBar(), &QStatusBar::showMessage);
+    QAction *quitAction = fileMenu->addAction("Quit", qApp, &QCoreApplication::quit);
     quitAction->setShortcut(Qt::CTRL + Qt::Key_Q);
     mainWindow.setCentralWidget(widget);
     mainWindow.show();
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();
 }