use nullptr consistently (clang-tidy)

From now on we prefer nullptr instead of 0 to clarify cases where
we are assigning or testing a pointer rather than a numeric zero.

Also, replaced cases where 0 was passed as Qt::KeyboardModifiers
with Qt::NoModifier (clang-tidy replaced them with nullptr, which
waas wrong, so it was just as well to make the tests more readable
rather than to revert those lines).

Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 80 insertions, 80 deletions

diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
index bdf7d3dcfd..248f8447e0 100644
--- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
+++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
@@ -57,7 +57,7 @@ class TouchDragArea : public QQuickItem
     Q_PROPERTY(bool keepTouchGrab READ keepTouchGrab WRITE setKeepTouchGrab NOTIFY keepTouchGrabChanged)
 
 public:
-    TouchDragArea(QQuickItem *parent = 0)
+    TouchDragArea(QQuickItem *parent = nullptr)
         : QQuickItem(parent)
         , touchEvents(0)
         , touchUpdates(0)
@@ -226,7 +226,7 @@ void tst_qquickflickable::create()
     QQmlComponent c(&engine, testFileUrl("flickable01.qml"));
     QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(c.create());
 
-    QVERIFY(obj != 0);
+    QVERIFY(obj != nullptr);
     QCOMPARE(obj->isAtXBeginning(), true);
     QCOMPARE(obj->isAtXEnd(), false);
     QCOMPARE(obj->isAtYBeginning(), true);
@@ -251,7 +251,7 @@ void tst_qquickflickable::horizontalViewportSize()
     QQmlComponent c(&engine, testFileUrl("flickable02.qml"));
     QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(c.create());
 
-    QVERIFY(obj != 0);
+    QVERIFY(obj != nullptr);
     QCOMPARE(obj->contentWidth(), 800.);
     QCOMPARE(obj->contentHeight(), 300.);
     QCOMPARE(obj->isAtXBeginning(), true);
@@ -268,7 +268,7 @@ void tst_qquickflickable::verticalViewportSize()
     QQmlComponent c(&engine, testFileUrl("flickable03.qml"));
     QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(c.create());
 
-    QVERIFY(obj != 0);
+    QVERIFY(obj != nullptr);
     QCOMPARE(obj->contentWidth(), 200.);
     QCOMPARE(obj->contentHeight(), 6000.);
     QCOMPARE(obj->isAtXBeginning(), true);
@@ -285,7 +285,7 @@ void tst_qquickflickable::visibleAreaRatiosUpdate()
     QQmlComponent c(&engine, testFileUrl("ratios.qml"));
     QQuickItem *obj = qobject_cast<QQuickItem*>(c.create());
 
-    QVERIFY(obj != 0);
+    QVERIFY(obj != nullptr);
     // check initial ratio values
     QCOMPARE(obj->property("heightRatioIs").toDouble(), obj->property("heightRatioShould").toDouble());
     QCOMPARE(obj->property("widthRatioIs").toDouble(), obj->property("widthRatioShould").toDouble());
@@ -307,7 +307,7 @@ void tst_qquickflickable::properties()
     QQmlComponent c(&engine, testFileUrl("flickable04.qml"));
     QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(c.create());
 
-    QVERIFY(obj != 0);
+    QVERIFY(obj != nullptr);
     QCOMPARE(obj->isInteractive(), false);
     QCOMPARE(obj->boundsBehavior(), QQuickFlickable::StopAtBounds);
     QCOMPARE(obj->pressDelay(), 200);
@@ -368,10 +368,10 @@ void tst_qquickflickable::rebound()
 
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
-    QVERIFY(flickable != 0);
+    QVERIFY(flickable != nullptr);
 
     QQuickTransition *rebound = window->rootObject()->findChild<QQuickTransition*>("rebound");
     QVERIFY(rebound);
@@ -507,7 +507,7 @@ void tst_qquickflickable::pressDelay()
     QQuickViewTestUtil::moveMouseAway(window.data());
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
     QSignalSpy spy(flickable, SIGNAL(pressDelayChanged()));
@@ -535,7 +535,7 @@ void tst_qquickflickable::pressDelay()
     QCOMPARE(clickedSpy.count(),0);
 
     // On release the clicked signal should be emitted
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(150, 150));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(150, 150));
     QCOMPARE(clickedSpy.count(),1);
 
     // Press and release position should match
@@ -553,7 +553,7 @@ void tst_qquickflickable::pressDelay()
     QCOMPARE(clickedSpy.count(),0);
 
     // On release the press, release and clicked signal should be emitted
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(180, 180));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(180, 180));
     QCOMPARE(clickedSpy.count(),1);
 
     // Press and release position should match
@@ -574,7 +574,7 @@ void tst_qquickflickable::pressDelay()
     QTRY_VERIFY(!mouseArea->property("pressed").toBool());
 
     // On release the clicked signal should *not* be emitted
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(150, 190));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(150, 190));
     QCOMPARE(clickedSpy.count(),1);
 }
 
@@ -588,13 +588,13 @@ void tst_qquickflickable::nestedPressDelay()
     QQuickViewTestUtil::moveMouseAway(window.data());
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *outer = qobject_cast<QQuickFlickable*>(window->rootObject());
-    QVERIFY(outer != 0);
+    QVERIFY(outer != nullptr);
 
     QQuickFlickable *inner = window->rootObject()->findChild<QQuickFlickable*>("innerFlickable");
-    QVERIFY(inner != 0);
+    QVERIFY(inner != nullptr);
 
     moveAndPress(window.data(), QPoint(150, 150));
     // the MouseArea is not pressed immediately
@@ -614,7 +614,7 @@ void tst_qquickflickable::nestedPressDelay()
     QVERIFY(inner->property("moving").toBool());
     QVERIFY(inner->property("dragging").toBool());
 
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(150, 150));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(150, 150));
 
     QVERIFY(!inner->property("dragging").toBool());
     QTRY_VERIFY(!inner->property("moving").toBool());
@@ -634,7 +634,7 @@ void tst_qquickflickable::nestedPressDelay()
     QVERIFY(!outer->property("moving").toBool());
     QVERIFY(!outer->property("dragging").toBool());
 
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(20, 150));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(20, 150));
 
     QVERIFY(!inner->property("dragging").toBool());
     QTRY_VERIFY(!inner->property("moving").toBool());
@@ -653,7 +653,7 @@ void tst_qquickflickable::nestedPressDelay()
     QVERIFY(inner->property("moving").toBool());
     QVERIFY(inner->property("dragging").toBool());
 
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(90, 150));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(90, 150));
 
     QVERIFY(!inner->property("dragging").toBool());
     QTRY_VERIFY(!inner->property("moving").toBool());
@@ -668,13 +668,13 @@ void tst_qquickflickable::filterReplayedPress()
     QQuickViewTestUtil::moveMouseAway(window.data());
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *outer = qobject_cast<QQuickFlickable*>(window->rootObject());
-    QVERIFY(outer != 0);
+    QVERIFY(outer != nullptr);
 
     QQuickFlickable *inner = window->rootObject()->findChild<QQuickFlickable*>("innerFlickable");
-    QVERIFY(inner != 0);
+    QVERIFY(inner != nullptr);
 
     QQuickItem *filteringMouseArea = outer->findChild<QQuickItem *>("filteringMouseArea");
     QVERIFY(filteringMouseArea);
@@ -697,7 +697,7 @@ void tst_qquickflickable::filterReplayedPress()
     QCOMPARE(filteringMouseArea->property("pressed").toBool(), true);
     QCOMPARE(filteringMouseArea->keepMouseGrab(), true);
 
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(150, 150));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(150, 150));
 }
 
 
@@ -711,13 +711,13 @@ void tst_qquickflickable::nestedClickThenFlick()
     QQuickViewTestUtil::moveMouseAway(window.data());
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *outer = qobject_cast<QQuickFlickable*>(window->rootObject());
-    QVERIFY(outer != 0);
+    QVERIFY(outer != nullptr);
 
     QQuickFlickable *inner = window->rootObject()->findChild<QQuickFlickable*>("innerFlickable");
-    QVERIFY(inner != 0);
+    QVERIFY(inner != nullptr);
 
     moveAndPress(window.data(), QPoint(150, 150));
 
@@ -725,7 +725,7 @@ void tst_qquickflickable::nestedClickThenFlick()
     QVERIFY(!outer->property("pressed").toBool());
     QTRY_VERIFY(outer->property("pressed").toBool());
 
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(150, 150));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(150, 150));
 
     QVERIFY(!outer->property("pressed").toBool());
 
@@ -743,7 +743,7 @@ void tst_qquickflickable::nestedClickThenFlick()
     QVERIFY(!outer->property("moving").toBool());
     QVERIFY(inner->property("moving").toBool());
 
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(80, 100));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(80, 100));
 }
 
 void tst_qquickflickable::flickableDirection()
@@ -785,7 +785,7 @@ void tst_qquickflickable::resizeContent()
     QQuickItem *root = qobject_cast<QQuickItem*>(c.create());
     QQuickFlickable *obj = findItem<QQuickFlickable>(root, "flick");
 
-    QVERIFY(obj != 0);
+    QVERIFY(obj != nullptr);
     QCOMPARE(obj->contentX(), 0.);
     QCOMPARE(obj->contentY(), 0.);
     QCOMPARE(obj->contentWidth(), 300.);
@@ -818,14 +818,14 @@ void tst_qquickflickable::returnToBounds()
     window->setSource(testFileUrl("resize.qml"));
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
     QQuickFlickable *obj = findItem<QQuickFlickable>(window->rootObject(), "flick");
 
     QQuickTransition *rebound = window->rootObject()->findChild<QQuickTransition*>("rebound");
     QVERIFY(rebound);
     QSignalSpy reboundSpy(rebound, SIGNAL(runningChanged()));
 
-    QVERIFY(obj != 0);
+    QVERIFY(obj != nullptr);
     QCOMPARE(obj->contentX(), 0.);
     QCOMPARE(obj->contentY(), 0.);
     QCOMPARE(obj->contentWidth(), 300.);
@@ -862,10 +862,10 @@ void tst_qquickflickable::wheel()
     window->setSource(testFileUrl("wheel.qml"));
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *flick = window->rootObject()->findChild<QQuickFlickable*>("flick");
-    QVERIFY(flick != 0);
+    QVERIFY(flick != nullptr);
     QQuickFlickablePrivate *fp = QQuickFlickablePrivate::get(flick);
     QSignalSpy moveEndSpy(flick, SIGNAL(movementEnded()));
 
@@ -916,10 +916,10 @@ void tst_qquickflickable::trackpad()
     window->setSource(testFileUrl("wheel.qml"));
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *flick = window->rootObject()->findChild<QQuickFlickable*>("flick");
-    QVERIFY(flick != 0);
+    QVERIFY(flick != nullptr);
     QSignalSpy moveEndSpy(flick, SIGNAL(movementEnded()));
     QPoint pos(200, 200);
 
@@ -993,10 +993,10 @@ void tst_qquickflickable::movingAndFlicking()
     QQuickViewTestUtil::moveMouseAway(window.data());
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
-    QVERIFY(flickable != 0);
+    QVERIFY(flickable != nullptr);
 
     QSignalSpy vMoveSpy(flickable, SIGNAL(movingVerticallyChanged()));
     QSignalSpy hMoveSpy(flickable, SIGNAL(movingHorizontallyChanged()));
@@ -1156,10 +1156,10 @@ void tst_qquickflickable::movingAndDragging()
     QQuickViewTestUtil::moveMouseAway(window.data());
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
-    QVERIFY(flickable != 0);
+    QVERIFY(flickable != nullptr);
 
     QSignalSpy vDragSpy(flickable, SIGNAL(draggingVerticallyChanged()));
     QSignalSpy hDragSpy(flickable, SIGNAL(draggingHorizontallyChanged()));
@@ -1201,7 +1201,7 @@ void tst_qquickflickable::movingAndDragging()
     QCOMPARE(moveStartSpy.count(), 1);
     QCOMPARE(dragStartSpy.count(), 1);
 
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, moveFrom + moveByWithoutSnapBack*3);
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, moveFrom + moveByWithoutSnapBack*3);
 
     QVERIFY(!flickable->isDragging());
     QVERIFY(!flickable->isDraggingHorizontally());
@@ -1274,7 +1274,7 @@ void tst_qquickflickable::movingAndDragging()
      QCOMPARE(dragStartSpy.count(), 1);
      QCOMPARE(dragEndSpy.count(), 0);
 
-     QTest::mouseRelease(window.data(), Qt::LeftButton, 0, moveFrom + moveByWithSnapBack*3);
+     QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, moveFrom + moveByWithSnapBack*3);
 
      // should now start snapping back to bounds (moving but not dragging)
      QVERIFY(flickable->isMoving());
@@ -1325,10 +1325,10 @@ void tst_qquickflickable::flickOnRelease()
     window->setSource(testFileUrl("flickable03.qml"));
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
-    QVERIFY(flickable != 0);
+    QVERIFY(flickable != nullptr);
 
     // Vertical with a quick press-move-release: should cause a flick in release.
     QSignalSpy vFlickSpy(flickable, SIGNAL(flickingVerticallyChanged()));
@@ -1339,7 +1339,7 @@ void tst_qquickflickable::flickOnRelease()
     // working even with small movements.
     moveAndPress(window.data(), QPoint(50, 300));
     QTest::mouseMove(window.data(), QPoint(50, 10), 10);
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(50, 10), 10);
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(50, 10), 10);
 
     QCOMPARE(vFlickSpy.count(), 1);
 
@@ -1359,10 +1359,10 @@ void tst_qquickflickable::pressWhileFlicking()
     QQuickViewTestUtil::moveMouseAway(window.data());
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
-    QVERIFY(flickable != 0);
+    QVERIFY(flickable != nullptr);
 
     QSignalSpy vMoveSpy(flickable, SIGNAL(movingVerticallyChanged()));
     QSignalSpy hMoveSpy(flickable, SIGNAL(movingHorizontallyChanged()));
@@ -1388,13 +1388,13 @@ void tst_qquickflickable::pressWhileFlicking()
     QCOMPARE(hFlickSpy.count(), 0);
     QCOMPARE(flickSpy.count(), 1);
 
-    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(20, 50));
+    QTest::mousePress(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(20, 50));
     QTRY_VERIFY(!flickable->isFlicking());
     QVERIFY(!flickable->isFlickingVertically());
     QVERIFY(flickable->isMoving());
     QVERIFY(flickable->isMovingVertically());
 
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(20,50));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(20,50));
     QVERIFY(!flickable->isFlicking());
     QVERIFY(!flickable->isFlickingVertically());
     QTRY_VERIFY(!flickable->isMoving());
@@ -1409,10 +1409,10 @@ void tst_qquickflickable::disabled()
     window->setSource(testFileUrl("disabled.qml"));
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *flick = window->rootObject()->findChild<QQuickFlickable*>("flickable");
-    QVERIFY(flick != 0);
+    QVERIFY(flick != nullptr);
 
     moveAndPress(window.data(), QPoint(50, 90));
 
@@ -1422,11 +1422,11 @@ void tst_qquickflickable::disabled()
 
     QVERIFY(!flick->isMoving());
 
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(50, 60));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(50, 60));
 
     // verify that mouse clicks on other elements still work (QTBUG-20584)
     moveAndPress(window.data(), QPoint(50, 10));
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(50, 10));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(50, 10));
 
     QTRY_VERIFY(window->rootObject()->property("clicked").toBool());
 }
@@ -1440,10 +1440,10 @@ void tst_qquickflickable::flickVelocity()
     QQuickViewTestUtil::moveMouseAway(window.data());
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
-    QVERIFY(flickable != 0);
+    QVERIFY(flickable != nullptr);
 
     // flick up
     flick(window.data(), QPoint(20,190), QPoint(20, 50), 200);
@@ -1488,7 +1488,7 @@ void tst_qquickflickable::margins()
     QQuickItem *root = window->rootObject();
     QVERIFY(root);
     QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(root);
-    QVERIFY(obj != 0);
+    QVERIFY(obj != nullptr);
 
     // starting state
     QCOMPARE(obj->contentX(), -40.);
@@ -1567,10 +1567,10 @@ void tst_qquickflickable::cancelOnMouseGrab()
     QQuickViewTestUtil::moveMouseAway(window.data());
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
-    QVERIFY(flickable != 0);
+    QVERIFY(flickable != nullptr);
 
     moveAndPress(window.data(), QPoint(10, 10));
     // drag out of bounds
@@ -1605,20 +1605,20 @@ void tst_qquickflickable::clickAndDragWhenTransformed()
     QQuickViewTestUtil::moveMouseAway(view.data());
     view->show();
     QVERIFY(QTest::qWaitForWindowActive(view.data()));
-    QVERIFY(view->rootObject() != 0);
+    QVERIFY(view->rootObject() != nullptr);
 
     QQuickFlickable *flickable = view->rootObject()->findChild<QQuickFlickable*>("flickable");
-    QVERIFY(flickable != 0);
+    QVERIFY(flickable != nullptr);
 
     // click outside child rect
     moveAndPress(view.data(), QPoint(190, 190));
     QTRY_COMPARE(flickable->property("itemPressed").toBool(), false);
-    QTest::mouseRelease(view.data(), Qt::LeftButton, 0, QPoint(190, 190));
+    QTest::mouseRelease(view.data(), Qt::LeftButton, Qt::NoModifier, QPoint(190, 190));
 
     // click inside child rect
     moveAndPress(view.data(), QPoint(200, 200));
     QTRY_COMPARE(flickable->property("itemPressed").toBool(), true);
-    QTest::mouseRelease(view.data(), Qt::LeftButton, 0, QPoint(200, 200));
+    QTest::mouseRelease(view.data(), Qt::LeftButton, Qt::NoModifier, QPoint(200, 200));
 
     const int threshold = qApp->styleHints()->startDragDistance();
 
@@ -1649,10 +1649,10 @@ void tst_qquickflickable::flickTwiceUsingTouches()
     QQuickViewTestUtil::centerOnScreen(window.data());
     QQuickViewTestUtil::moveMouseAway(window.data());
     window->show();
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
-    QVERIFY(flickable != 0);
+    QVERIFY(flickable != nullptr);
 
     QCOMPARE(flickable->contentY(), 0.0f);
     flickWithTouch(window.data(), QPoint(100, 400), QPoint(100, 240));
@@ -1780,7 +1780,7 @@ void tst_qquickflickable::nestedStopAtBounds()
     QCOMPARE(outer->isMoving(), true);
     QCOMPARE(inner->isDragging(), false);
     QCOMPARE(inner->isMoving(), false);
-    QTest::mouseRelease(&view, Qt::LeftButton, 0, position);
+    QTest::mouseRelease(&view, Qt::LeftButton, Qt::NoModifier, position);
 
     QVERIFY(!outer->isDragging());
     QTRY_VERIFY(!outer->isMoving());
@@ -1802,7 +1802,7 @@ void tst_qquickflickable::nestedStopAtBounds()
     QCOMPARE(outer->isMoving(), false);
     QCOMPARE(inner->isDragging(), true);
     QCOMPARE(inner->isMoving(), true);
-    QTest::mouseRelease(&view, Qt::LeftButton, 0, position);
+    QTest::mouseRelease(&view, Qt::LeftButton, Qt::NoModifier, position);
 
     QVERIFY(!inner->isDragging());
     QTRY_VERIFY(!inner->isMoving());
@@ -1826,7 +1826,7 @@ void tst_qquickflickable::nestedStopAtBounds()
     QCOMPARE(outer->isMoving(), true);
     QCOMPARE(inner->isDragging(), false);
     QCOMPARE(inner->isMoving(), false);
-    QTest::mouseRelease(&view, Qt::LeftButton, 0, position);
+    QTest::mouseRelease(&view, Qt::LeftButton, Qt::NoModifier, position);
 
     QVERIFY(!outer->isDragging());
     QTRY_VERIFY(!outer->isMoving());
@@ -1850,7 +1850,7 @@ void tst_qquickflickable::nestedStopAtBounds()
     QCOMPARE(outer->isMoving(), true);
     QCOMPARE(inner->isDragging(), false);
     QCOMPARE(inner->isMoving(), false);
-    QTest::mouseRelease(&view, Qt::LeftButton, 0, position);
+    QTest::mouseRelease(&view, Qt::LeftButton, Qt::NoModifier, position);
 
     QVERIFY(!outer->isDragging());
     QTRY_VERIFY(!outer->isMoving());
@@ -1946,7 +1946,7 @@ void tst_qquickflickable::stopAtBounds()
         QCOMPARE(transpose ? flickable->contentY() : flickable->contentX(), 0.0);
     }
 
-    QTest::mouseRelease(&view, Qt::LeftButton, 0, position);
+    QTest::mouseRelease(&view, Qt::LeftButton, Qt::NoModifier, position);
 
     if (transpose) {
         flickable->setContentY(invert ? 100 : 0);
@@ -1982,10 +1982,10 @@ void tst_qquickflickable::nestedMouseAreaUsingTouch()
     QQuickViewTestUtil::centerOnScreen(window.data());
     QQuickViewTestUtil::moveMouseAway(window.data());
     window->show();
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
-    QVERIFY(flickable != 0);
+    QVERIFY(flickable != nullptr);
 
     QCOMPARE(flickable->contentY(), 50.0f);
     flickWithTouch(window.data(), QPoint(100, 300), QPoint(100, 200));
@@ -2028,7 +2028,7 @@ void tst_qquickflickable::nestedSliderUsingTouch()
     QQuickViewTestUtil::moveMouseAway(window);
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
     QVERIFY(flickable);
@@ -2067,11 +2067,11 @@ void tst_qquickflickable::pressDelayWithLoader()
     QQuickViewTestUtil::moveMouseAway(window.data());
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QVERIFY(window->rootObject() != 0);
+    QVERIFY(window->rootObject() != nullptr);
 
     // do not crash
     moveAndPress(window.data(), QPoint(150, 150));
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(150, 150));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(150, 150));
 }
 
 // QTBUG-34507
@@ -2086,7 +2086,7 @@ void tst_qquickflickable::movementFromProgrammaticFlick()
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
-    QVERIFY(flickable != 0);
+    QVERIFY(flickable != nullptr);
 
     // verify that the signals for movement and flicking are called in the right order
     flickable->flick(0, -1000);
@@ -2141,7 +2141,7 @@ void tst_qquickflickable::ratios_smallContent()
     QQuickItem *root = window->rootObject();
     QVERIFY(root);
     QQuickFlickable *obj = qobject_cast<QQuickFlickable*>(root);
-    QVERIFY(obj != 0);
+    QVERIFY(obj != nullptr);
 
     //doublecheck the item, as specified by contentWidth/Height, fits in the view
     //use tryCompare to allow a bit of stabilization in component's properties
@@ -2198,7 +2198,7 @@ void tst_qquickflickable::keepGrab()
         QTest::mouseMove(window.data(), pos);
         QTest::qWait(10);
     }
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(310, 310));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(310, 310));
     QTest::qWait(10);
 
     QCOMPARE(flickable->contentX(), 0.0);
@@ -2213,7 +2213,7 @@ void tst_qquickflickable::keepGrab()
         QTest::mouseMove(window.data(), pos);
         QTest::qWait(10);
     }
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(310, 310));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(310, 310));
     QTest::qWait(10);
 
     QVERIFY(flickable->contentX() != 0.0);
@@ -2245,11 +2245,11 @@ void tst_qquickflickable::overshoot()
     flickable->setBoundsMovement(QQuickFlickable::BoundsMovement(boundsMovement));
 
     // drag past the beginning
-    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(10, 10));
+    QTest::mousePress(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(10, 10));
     QTest::mouseMove(window.data(), QPoint(20, 20));
     QTest::mouseMove(window.data(), QPoint(30, 30));
     QTest::mouseMove(window.data(), QPoint(40, 40));
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(50, 50));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(50, 50));
 
     if ((boundsMovement == QQuickFlickable::FollowBoundsBehavior) && (boundsBehavior & QQuickFlickable::DragOverBounds)) {
         QVERIFY(flickable->property("minContentX").toReal() < 0.0);
@@ -2314,11 +2314,11 @@ void tst_qquickflickable::overshoot()
     QMetaObject::invokeMethod(flickable, "reset");
 
     // drag past the end
-    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(50, 50));
+    QTest::mousePress(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(50, 50));
     QTest::mouseMove(window.data(), QPoint(40, 40));
     QTest::mouseMove(window.data(), QPoint(30, 30));
     QTest::mouseMove(window.data(), QPoint(20, 20));
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(10, 10));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(10, 10));
 
     if ((boundsMovement == QQuickFlickable::FollowBoundsBehavior) && (boundsBehavior & QQuickFlickable::DragOverBounds)) {
         QVERIFY(flickable->property("maxContentX").toReal() > 200.0);