diff options
Diffstat (limited to 'tests/auto/quick/qquickgridview')
| -rw-r--r-- | tests/auto/quick/qquickgridview/tst_qquickgridview.cpp | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp index f7f8b24bb3..c17f2e9d0a 100644 --- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp @@ -4305,6 +4305,7 @@ void tst_QQuickGridView::snapToRow() QFETCH(qreal, snapAlignment); QFETCH(qreal, endExtent); QFETCH(qreal, startExtent); + auto device = QPointingDevice::primaryPointingDevice(); QQuickView *window = getView(); @@ -4327,7 +4328,7 @@ void tst_QQuickGridView::snapToRow() qreal origContentY = gridview->contentY(); qreal origContentX = gridview->contentX(); // confirm that a flick hits an item boundary - flick(window, flickStart, flickEnd, 180); + QQuickTest::pointerFlick(device, window, 0, flickStart, flickEnd, 180); // wait until it's at least one cell further QTRY_VERIFY(qAbs(gridview->contentX() - origContentX) > 80 || @@ -4345,7 +4346,7 @@ void tst_QQuickGridView::snapToRow() // flick to end do { - flick(window, flickStart, flickEnd, 180); + QQuickTest::pointerFlick(device, window, 0, flickStart, flickEnd, 180); QTRY_VERIFY(gridview->isMoving() == false); // wait until it stops } while (flow == QQuickGridView::FlowLeftToRight ? !gridview->isAtYEnd() @@ -4358,7 +4359,7 @@ void tst_QQuickGridView::snapToRow() // flick to start do { - flick(window, flickEnd, flickStart, 180); + QQuickTest::pointerFlick(device, window, 0, flickEnd, flickStart, 180); QTRY_VERIFY(gridview->isMoving() == false); // wait until it stops } while (flow == QQuickGridView::FlowLeftToRight ? !gridview->isAtYBeginning() @@ -4423,6 +4424,7 @@ void tst_QQuickGridView::snapOneRow() QFETCH(qreal, endExtent); QFETCH(qreal, startExtent); QFETCH(qreal, flickSlowdown); + auto device = QPointingDevice::primaryPointingDevice(); qreal flickDuration = 180 * flickSlowdown; @@ -4447,7 +4449,7 @@ void tst_QQuickGridView::snapOneRow() QSignalSpy currentIndexSpy(gridview, SIGNAL(currentIndexChanged())); // confirm that a flick hits next row boundary - flick(window, flickStart, flickEnd, flickDuration); + QQuickTest::pointerFlick(device, window, 0, flickStart, flickEnd, flickDuration); QTRY_VERIFY(gridview->isMoving() == false); // wait until it stops if (flow == QQuickGridView::FlowLeftToRight) QCOMPARE(gridview->contentY(), snapAlignment); @@ -4461,7 +4463,8 @@ void tst_QQuickGridView::snapOneRow() // flick to end do { - flick(window, flickStart, flickEnd, flickDuration); + QQuickTest::pointerFlick(device, window, 0, flickStart, flickEnd, + flickDuration, Qt::LeftButton, Qt::NoModifier, 500); QTRY_VERIFY(gridview->isMoving() == false); // wait until it stops } while (flow == QQuickGridView::FlowLeftToRight ? !gridview->isAtYEnd() @@ -4479,7 +4482,8 @@ void tst_QQuickGridView::snapOneRow() // flick to start do { - flick(window, flickEnd, flickStart, flickDuration); + QQuickTest::pointerFlick(device, window, 0, flickEnd, flickStart, + flickDuration, Qt::LeftButton, Qt::NoModifier, 500); QTRY_VERIFY(gridview->isMoving() == false); // wait until it stops } while (flow == QQuickGridView::FlowLeftToRight ? !gridview->isAtYBeginning() @@ -6701,6 +6705,7 @@ void tst_QQuickGridView::positionViewAtBeginningAfterResizingCells() void tst_QQuickGridView::keyNavigationEnabled() { + auto device = QPointingDevice::primaryPointingDevice(); QScopedPointer<QQuickView> window(createView()); window->setSource(testFileUrl("keyNavigationEnabled.qml")); window->show(); @@ -6723,7 +6728,7 @@ void tst_QQuickGridView::keyNavigationEnabled() QCOMPARE(enabledSpy.size(), 1); QCOMPARE(gridView->isKeyNavigationEnabled(), false); - flick(window.data(), QPoint(200, 175), QPoint(200, 50), 100); + QQuickTest::pointerFlick(device, window.data(), 0, QPoint(200, 175), QPoint(200, 50), 100); QVERIFY(!gridView->isMoving()); QCOMPARE(gridView->contentY(), 0.0); QCOMPARE(gridView->currentIndex(), 0); @@ -6744,7 +6749,7 @@ void tst_QQuickGridView::keyNavigationEnabled() // Setting keyNavigationEnabled to true shouldn't enable mouse interaction. gridView->setKeyNavigationEnabled(true); QCOMPARE(enabledSpy.size(), 4); - flick(window.data(), QPoint(200, 175), QPoint(200, 50), 100); + QQuickTest::pointerFlick(device, window.data(), 0, QPoint(200, 175), QPoint(200, 50), 100); QVERIFY(!gridView->isMoving()); QCOMPARE(gridView->contentY(), 0.0); QCOMPARE(gridView->currentIndex(), 0); @@ -6766,6 +6771,7 @@ void tst_QQuickGridView::keyNavigationEnabled() void tst_QQuickGridView::QTBUG_48870_fastModelUpdates() { + auto device = QPointingDevice::primaryPointingDevice(); StressTestModel model; QScopedPointer<QQuickView> window(createView()); @@ -6793,9 +6799,9 @@ void tst_QQuickGridView::QTBUG_48870_fastModelUpdates() : QString("Found index %1, expected index is %3").arg(item->index).arg(expectedIdx))); if (i % 3 != 0) { if (i & 1) - flick(window.data(), QPoint(100, 200), QPoint(100, 0), 100); + QQuickTest::pointerFlick(device, window.data(), 0, QPoint(100, 200), QPoint(100, 0), 100); else - flick(window.data(), QPoint(100, 200), QPoint(100, 400), 100); + QQuickTest::pointerFlick(device, window.data(), 0, QPoint(100, 200), QPoint(100, 400), 100); } } } |