diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 11:35:19 +0000 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 13:06:13 +0000 |
commit | eeafc5f3b3aa604366ca89015eaf5adeb11bbadc (patch) | |
tree | e5633a0d1b35dbed6d5069d1757bcfa9ba7da19a | |
parent | 75fa969d58c551040073d34f285da629de1aa3da (diff) |
Fix build after event API changes
Some deprecated functions were removed in dev.
Change-Id: Iad9910051efe0a499f0e0a4f2e151c39ddd0fcd0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r-- | tests/auto/client/tabletv2/tst_tabletv2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/client/tabletv2/tst_tabletv2.cpp b/tests/auto/client/tabletv2/tst_tabletv2.cpp index 2fe2ff420..03fb2933d 100644 --- a/tests/auto/client/tabletv2/tst_tabletv2.cpp +++ b/tests/auto/client/tabletv2/tst_tabletv2.cpp @@ -465,7 +465,7 @@ protected: case QEvent::TabletEnterProximity: case QEvent::TabletLeaveProximity: { auto *e = static_cast<QTabletEvent *>(event); - auto *ev = new QTabletEvent(e->type(), e->posF(), e->globalPosF(), e->device(), + auto *ev = new QTabletEvent(e->type(), e->posF(), e->globalPosF(), e->deviceType(), e->pointerType(), e->pressure(), e->xTilt(), e->yTilt(), e->tangentialPressure(), e->rotation(), e->z(), Qt::KeyboardModifier::NoModifier, e->uniqueId(), @@ -600,7 +600,7 @@ public: void tabletEvent(QTabletEvent *e) override { - m_events << new QTabletEvent(e->type(), e->posF(), e->globalPosF(), e->device(), + m_events << new QTabletEvent(e->type(), e->posF(), e->globalPosF(), e->deviceType(), e->pointerType(), e->pressure(), e->xTilt(), e->yTilt(), e->tangentialPressure(), e->rotation(), e->z(), Qt::KeyboardModifier::NoModifier, e->uniqueId(), e->button(), @@ -705,12 +705,12 @@ void tst_tabletv2::pointerType() QTRY_COMPARE(filter.numEvents(), 1); QTabletEvent *event = filter.popEvent(); QCOMPARE(event->pointerType(), pointerType); - QCOMPARE(event->device(), tabletDevice); + QCOMPARE(event->deviceType(), tabletDevice); QTRY_VERIFY(window.numEvents()); event = window.popEvent(); QCOMPARE(event->pointerType(), pointerType); - QCOMPARE(event->device(), tabletDevice); + QCOMPARE(event->deviceType(), tabletDevice); exec([&] { tabletTool()->sendProximityOut(); @@ -720,7 +720,7 @@ void tst_tabletv2::pointerType() QTRY_VERIFY(filter.numEvents()); event = filter.popEvent(); QCOMPARE(event->pointerType(), pointerType); - QCOMPARE(event->device(), tabletDevice); + QCOMPARE(event->deviceType(), tabletDevice); } void tst_tabletv2::hardwareSerial() |