From f2bc2a7c1970cc36199ddbe302e437eb9726aa62 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 27 Oct 2020 14:36:38 +0100 Subject: [PATCH] Fix some compile warnings QTouchEvent::touchPoints() is deprecated and replaced by just points(), and there is a new value in Qt::TouchPointState. normalizedPos() is replaced by normalizedPosition(). And QVariant::type() is deprecated. Change-Id: I4a4eea2775030f67ad12488df25d4859099c1783 Reviewed-by: Shawn Rutledge --- tests/auto/wayland/seatv5/tst_seatv5.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/wayland/seatv5/tst_seatv5.cpp b/tests/auto/wayland/seatv5/tst_seatv5.cpp index 0c4dcfe0699..69c52ed5a84 100644 --- a/tests/auto/wayland/seatv5/tst_seatv5.cpp +++ b/tests/auto/wayland/seatv5/tst_seatv5.cpp @@ -421,7 +421,7 @@ public: explicit Event(const QTouchEvent *event) : type(event->type()) , touchPointStates(event->touchPointStates()) - , touchPoints(event->touchPoints()) + , touchPoints(event->points()) { } QEvent::Type type{}; @@ -506,7 +506,7 @@ void tst_seatv5::multiTouch() t->sendDown(xdgToplevel()->surface(), {48, 48}, 1); t->sendFrame(c); - // Compositor event order should not change the order of the QTouchEvent::touchPoints() + // Compositor event order should not change the order of the QTouchEvent::points() // See QTBUG-77014 t->sendMotion(c, {49, 48}, 1); t->sendMotion(c, {33, 32}, 0);