summaryrefslogtreecommitdiff
path: root/tests/auto
diff options
context:
space:
mode:
authorJiDe Zhang <zhangjide@uniontech.com>2022-07-04 17:05:36 +0800
committerJiDe Zhang <zhangjide@uniontech.com>2022-07-04 17:10:02 +0800
commit354d9c40314c1d5d9db73e1e11c1f43ca654f00a (patch)
tree5f58aa5b81f89fdc82d77cf116b337f92d1a2b63 /tests/auto
parent64dac044e3677ff99e103ab7f6980309967c68af (diff)
downloadqtwayland-354d9c40314c1d5d9db73e1e11c1f43ca654f00a.tar.gz
Fix some build warnings
Pick-to: 6.2 6.3 6.4 Change-Id: I61edd5ab0f4383930ad37916e4cec4ab714274d4 Reviewed-by: David Edmundson <davidedmundson@kde.org>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/client/tabletv2/tst_tabletv2.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/client/tabletv2/tst_tabletv2.cpp b/tests/auto/client/tabletv2/tst_tabletv2.cpp
index 2e06e663..b4d01628 100644
--- a/tests/auto/client/tabletv2/tst_tabletv2.cpp
+++ b/tests/auto/client/tabletv2/tst_tabletv2.cpp
@@ -191,7 +191,7 @@ public:
QList<TabletPadV2 *> m_padsWaitingForDestroy;
protected:
- void zwp_tablet_seat_v2_bind_resource(Resource *resource)
+ void zwp_tablet_seat_v2_bind_resource(Resource *resource) override
{
for (auto *tablet : m_tablets)
sendTabletAdded(resource, tablet);
@@ -701,12 +701,12 @@ void tst_tabletv2::pointerType()
void tst_tabletv2::hardwareSerial()
{
ProximityFilter filter;
- const qint64 uid = 0xbaba15dead15f00d;
+ const QPointingDeviceUniqueId uid = QPointingDeviceUniqueId::fromNumericId(0xbaba15dead15f00d);
QCOMPOSITOR_TRY_VERIFY(tabletSeat());
exec([&] {
tabletSeat()->addTablet();
- tabletSeat()->addTool(ToolType::type_pen, uid);
+ tabletSeat()->addTool(ToolType::type_pen, uid.numericId());
});
TabletWindow window;
@@ -726,11 +726,11 @@ void tst_tabletv2::hardwareSerial()
QTRY_COMPARE(filter.numEvents(), 1);
QTabletEvent *event = filter.popEvent();
- QCOMPARE(event->uniqueId(), uid);
+ QCOMPARE(event->pointingDevice()->uniqueId(), uid);
QTRY_VERIFY(window.numEvents());
event = window.popEvent();
- QCOMPARE(event->uniqueId(), uid);
+ QCOMPARE(event->pointingDevice()->uniqueId(), uid);
exec([&] {
tabletTool()->sendProximityOut();
@@ -739,7 +739,7 @@ void tst_tabletv2::hardwareSerial()
QTRY_VERIFY(filter.numEvents());
event = filter.popEvent();
- QCOMPARE(event->uniqueId(), uid);
+ QCOMPARE(event->pointingDevice()->uniqueId(), uid);
}
// As defined in linux/input-event-codes.h