diff options
| author | JiDe Zhang <zhangjide@uniontech.com> | 2022-07-04 17:05:36 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-05 05:40:19 +0000 |
| commit | e310036807eabb002e884633f765c7d9dd08fba1 (patch) | |
| tree | a2bcefb6caac5a2c27a95e932db50c15383b95d8 | |
| parent | 1a4d53d55ee9d1654adf16c0a24d43bf0b1d122a (diff) | |
| download | qtwayland-e310036807eabb002e884633f765c7d9dd08fba1.tar.gz | |
Fix some build warnings
Change-Id: I61edd5ab0f4383930ad37916e4cec4ab714274d4
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit 354d9c40314c1d5d9db73e1e11c1f43ca654f00a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tests/auto/client/tabletv2/tst_tabletv2.cpp | 12 |
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 |