1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some build warnings

Browse Source 
Pick-to: 6.2 6.3 6.4
Change-Id: I61edd5ab0f4383930ad37916e4cec4ab714274d4
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
JiDe Zhang 2022-07-04 17:05:36 +08:00
parent 79cc2f159c
commit 425893491d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/wayland/tabletv2/tst_tabletv2.cpp
View File

@ -191,7 +191,7 @@ public:
QList<TabletPadV2 *> m_padsWaitingForDestroy; QList<TabletPadV2 *> m_padsWaitingForDestroy;
protected: 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) for (auto *tablet : m_tablets)
sendTabletAdded(resource, tablet); sendTabletAdded(resource, tablet);
@ -701,12 +701,12 @@ void tst_tabletv2::pointerType()
void tst_tabletv2::hardwareSerial() void tst_tabletv2::hardwareSerial()
{ {
ProximityFilter filter; ProximityFilter filter;
const qint64 uid = 0xbaba15dead15f00d; const QPointingDeviceUniqueId uid = QPointingDeviceUniqueId::fromNumericId(0xbaba15dead15f00d);
QCOMPOSITOR_TRY_VERIFY(tabletSeat()); QCOMPOSITOR_TRY_VERIFY(tabletSeat());
exec([&] { exec([&] {
tabletSeat()->addTablet(); tabletSeat()->addTablet();
tabletSeat()->addTool(ToolType::type_pen, uid); tabletSeat()->addTool(ToolType::type_pen, uid.numericId());
}); });
TabletWindow window; TabletWindow window;
@ -726,11 +726,11 @@ void tst_tabletv2::hardwareSerial()
QTRY_COMPARE(filter.numEvents(), 1); QTRY_COMPARE(filter.numEvents(), 1);
QTabletEvent *event = filter.popEvent(); QTabletEvent *event = filter.popEvent();
QCOMPARE(event->uniqueId(), uid); QCOMPARE(event->pointingDevice()->uniqueId(), uid);
QTRY_VERIFY(window.numEvents()); QTRY_VERIFY(window.numEvents());
event = window.popEvent(); event = window.popEvent();
QCOMPARE(event->uniqueId(), uid); QCOMPARE(event->pointingDevice()->uniqueId(), uid);
exec([&] { exec([&] {
tabletTool()->sendProximityOut(); tabletTool()->sendProximityOut();
@ -739,7 +739,7 @@ void tst_tabletv2::hardwareSerial()
QTRY_VERIFY(filter.numEvents()); QTRY_VERIFY(filter.numEvents());
event = filter.popEvent(); event = filter.popEvent();
QCOMPARE(event->uniqueId(), uid); QCOMPARE(event->pointingDevice()->uniqueId(), uid);
} }
// As defined in linux/input-event-codes.h // As defined in linux/input-event-codes.h