Fix build after event API changes
Some deprecated functions were removed in dev. Change-Id: Iad9910051efe0a499f0e0a4f2e151c39ddd0fcd0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
38ab2bf15f
commit
8d8e4f3ffb
@ -465,7 +465,7 @@ protected:
|
|||||||
case QEvent::TabletEnterProximity:
|
case QEvent::TabletEnterProximity:
|
||||||
case QEvent::TabletLeaveProximity: {
|
case QEvent::TabletLeaveProximity: {
|
||||||
auto *e = static_cast<QTabletEvent *>(event);
|
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->pointerType(), e->pressure(), e->xTilt(), e->yTilt(),
|
||||||
e->tangentialPressure(), e->rotation(), e->z(),
|
e->tangentialPressure(), e->rotation(), e->z(),
|
||||||
Qt::KeyboardModifier::NoModifier, e->uniqueId(),
|
Qt::KeyboardModifier::NoModifier, e->uniqueId(),
|
||||||
@ -600,7 +600,7 @@ public:
|
|||||||
|
|
||||||
void tabletEvent(QTabletEvent *e) override
|
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->pointerType(), e->pressure(), e->xTilt(), e->yTilt(),
|
||||||
e->tangentialPressure(), e->rotation(), e->z(),
|
e->tangentialPressure(), e->rotation(), e->z(),
|
||||||
Qt::KeyboardModifier::NoModifier, e->uniqueId(), e->button(),
|
Qt::KeyboardModifier::NoModifier, e->uniqueId(), e->button(),
|
||||||
@ -705,12 +705,12 @@ void tst_tabletv2::pointerType()
|
|||||||
QTRY_COMPARE(filter.numEvents(), 1);
|
QTRY_COMPARE(filter.numEvents(), 1);
|
||||||
QTabletEvent *event = filter.popEvent();
|
QTabletEvent *event = filter.popEvent();
|
||||||
QCOMPARE(event->pointerType(), pointerType);
|
QCOMPARE(event->pointerType(), pointerType);
|
||||||
QCOMPARE(event->device(), tabletDevice);
|
QCOMPARE(event->deviceType(), tabletDevice);
|
||||||
|
|
||||||
QTRY_VERIFY(window.numEvents());
|
QTRY_VERIFY(window.numEvents());
|
||||||
event = window.popEvent();
|
event = window.popEvent();
|
||||||
QCOMPARE(event->pointerType(), pointerType);
|
QCOMPARE(event->pointerType(), pointerType);
|
||||||
QCOMPARE(event->device(), tabletDevice);
|
QCOMPARE(event->deviceType(), tabletDevice);
|
||||||
|
|
||||||
exec([&] {
|
exec([&] {
|
||||||
tabletTool()->sendProximityOut();
|
tabletTool()->sendProximityOut();
|
||||||
@ -720,7 +720,7 @@ void tst_tabletv2::pointerType()
|
|||||||
QTRY_VERIFY(filter.numEvents());
|
QTRY_VERIFY(filter.numEvents());
|
||||||
event = filter.popEvent();
|
event = filter.popEvent();
|
||||||
QCOMPARE(event->pointerType(), pointerType);
|
QCOMPARE(event->pointerType(), pointerType);
|
||||||
QCOMPARE(event->device(), tabletDevice);
|
QCOMPARE(event->deviceType(), tabletDevice);
|
||||||
}
|
}
|
||||||
|
|
||||||
void tst_tabletv2::hardwareSerial()
|
void tst_tabletv2::hardwareSerial()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user