summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2020-10-27 14:36:38 +0100
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2020-11-17 07:10:32 +0000
commit9415c8b5cd075eaa643595e779227ca623087330 (patch)
tree6904854c698214d795915886b8deb273d67094fd /tests/auto
parent8cb1b07aea12d50b4fecc45c903705dfd368022a (diff)
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 <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/client/seatv5/tst_seatv5.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/client/seatv5/tst_seatv5.cpp b/tests/auto/client/seatv5/tst_seatv5.cpp
index 0c4dcfe06..69c52ed5a 100644
--- a/tests/auto/client/seatv5/tst_seatv5.cpp
+++ b/tests/auto/client/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);