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

 Conflicts:
	src/corelib/corelib.pro
	src/corelib/global/qrandom.cpp
	src/network/access/qhttpnetworkrequest_p.h
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/plugins/platforms/cocoa/qcocoansmenu.mm
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/offscreen/qoffscreenintegration.h
	src/widgets/kernel/qaction.cpp
	src/widgets/widgets.pro

Done-with: Andy Shaw <andy.shaw@qt.io>
Change-Id: Ib01547cf4184023f19858ccf0ce7fb824fed2a8d

1 files changed, 76 insertions, 0 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 3b340d06ab..fe8571abf1 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -254,6 +254,7 @@ private slots:
     void zeroScale();
     void focusItemChangedSignal();
     void minimumRenderSize();
+    void checkTouchPointsEllipseDiameters();
 
     // task specific tests below me
     void task139710_bspTreeCrash();
@@ -4764,6 +4765,81 @@ void tst_QGraphicsScene::minimumRenderSize()
     QVERIFY(smallChild->repaints > smallerGrandChild->repaints);
 }
 
+class TouchItem : public QGraphicsRectItem
+{
+public:
+    TouchItem() : QGraphicsRectItem(QRectF(-10, -10, 20, 20)),
+    seenTouch(false)
+    {
+        setAcceptTouchEvents(true);
+        setFlag(QGraphicsItem::ItemIgnoresTransformations);
+    }
+    bool seenTouch;
+    QList<QTouchEvent::TouchPoint> touchPoints;
+protected:
+    bool sceneEvent(QEvent *event) override
+    {
+        switch (event->type()) {
+            case QEvent::TouchBegin:
+            case QEvent::TouchUpdate:
+            case QEvent::TouchEnd:
+                seenTouch = true;
+                touchPoints = static_cast<QTouchEvent *>(event)->touchPoints();
+                event->accept();
+                return true;
+            default:
+                break;
+        }
+        return QGraphicsRectItem::sceneEvent(event);
+    }
+};
+
+void tst_QGraphicsScene::checkTouchPointsEllipseDiameters()
+{
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    scene.setSceneRect(1, 1, 198, 198);
+    view.scale(1.5, 1.5);
+    view.setFocus();
+    TouchItem *rect = new TouchItem;
+    scene.addItem(rect);
+    view.show();
+    QApplication::setActiveWindow(&view);
+    QVERIFY(QTest::qWaitForWindowActive(&view));
+
+    const QSizeF ellipseDiameters(10.0, 10.0);
+    QTouchEvent::TouchPoint touchPoint(0);
+    touchPoint.setState(Qt::TouchPointPressed);
+    touchPoint.setPos(view.mapFromScene(rect->mapToScene(rect->boundingRect().center())));
+    touchPoint.setScreenPos(view.mapToGlobal(touchPoint.pos().toPoint()));
+    touchPoint.setEllipseDiameters(ellipseDiameters);
+
+    QList<QTouchEvent::TouchPoint> touchPoints = { touchPoint };
+
+    QTouchDevice *testDevice = QTest::createTouchDevice(QTouchDevice::TouchPad);
+    QTouchEvent touchEvent(QEvent::TouchBegin,
+                           testDevice,
+                           Qt::NoModifier,
+                           Qt::TouchPointPressed,
+                           touchPoints);
+    QApplication::sendEvent(view.viewport(), &touchEvent);
+    QVERIFY(rect->seenTouch);
+    QVERIFY(rect->touchPoints.size() == 1);
+    QCOMPARE(ellipseDiameters, rect->touchPoints.first().ellipseDiameters());
+
+    rect->seenTouch = false;
+    rect->touchPoints.clear();
+    QTouchEvent touchUpdateEvent(QEvent::TouchUpdate,
+                                 testDevice,
+                                 Qt::NoModifier,
+                                 Qt::TouchPointMoved,
+                                 touchPoints);
+    QApplication::sendEvent(view.viewport(), &touchEvent);
+    QVERIFY(rect->seenTouch);
+    QVERIFY(rect->touchPoints.size() == 1);
+    QCOMPARE(ellipseDiameters, rect->touchPoints.first().ellipseDiameters());
+}
+
 void tst_QGraphicsScene::taskQTBUG_15977_renderWithDeviceCoordinateCache()
 {
     QGraphicsScene scene;