diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-03-26 16:50:40 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-23 17:44:03 +0200 |
| commit | d0ae3a312a03c118a1aa25a4c6c0352375d569fc (patch) | |
| tree | 01df3e8ea22c8a1ecd969a6e9e6d7014c635da9f /tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | |
| parent | d5d6a56809032796444fe63c220a2e940ce237c0 (diff) | |
Remove QQuickPointerDevice in favor of QPointingDevice
...and generally deal with changes immediately required after adding
QInputDevice and QPointingDevice.
Also fixed a few usages of deprecated accessors that weren't taken
care of in 212c2bffbb041aee0e3c9a7f0551ef151ed2d3ad.
Task-number: QTBUG-46412
Task-number: QTBUG-69433
Task-number: QTBUG-72167
Change-Id: I93a2643162878afa216556f10808fd92e0b20071
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'tests/auto/quick/qquicklistview/tst_qquicklistview.cpp')
| -rw-r--r-- | tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp index 56c3f370d2..4f504103d4 100644 --- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp @@ -352,7 +352,7 @@ private: QQuickView *m_view; QString testForView; - QTouchDevice *touchDevice = QTest::createTouchDevice(); + QPointingDevice *touchDevice = QTest::createTouchDevice(); }; class TestObject : public QObject @@ -9673,8 +9673,7 @@ void tst_QQuickListView::touchCancel() // QTBUG-74679 // and because Flickable filtered it, QQuickFlickablePrivate::pressed // should be true, but it's not easily tested here - QTouchEvent cancelEvent(QEvent::TouchCancel); - cancelEvent.setDevice(touchDevice); + QTouchEvent cancelEvent(QEvent::TouchCancel, touchDevice); QCoreApplication::sendEvent(window.data(), &cancelEvent); // now QQuickWindowPrivate::sendUngrabEvent() will be called, Flickable will filter it, // QQuickFlickablePrivate::pressed will be set to false, and that will allow setCurrentIndex() to make it move |