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>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/compositor/extensions/qwlqttouch.cpp b/src/compositor/extensions/qwlqttouch.cpp
index 2df66121..83e62b58 100644
--- a/src/compositor/extensions/qwlqttouch.cpp
+++ b/src/compositor/extensions/qwlqttouch.cpp
@@ -58,7 +58,7 @@ static inline int toFixed(qreal f)
 
 bool TouchExtensionGlobal::postTouchEvent(QTouchEvent *event, QWaylandSurface *surface)
 {
-    const QList<QTouchEvent::TouchPoint> points = event->touchPoints();
+    const QList<QTouchEvent::TouchPoint> points = event->points();
     const int pointCount = points.count();
     if (!pointCount)
         return false;
@@ -93,8 +93,8 @@ bool TouchExtensionGlobal::postTouchEvent(QTouchEvent *event, QWaylandSurface *s
 
             int x = toFixed(tp.position().x());
             int y = toFixed(tp.position().y());
-            int nx = toFixed(tp.normalizedPos().x());
-            int ny = toFixed(tp.normalizedPos().y());
+            int nx = toFixed(tp.normalizedPosition().x());
+            int ny = toFixed(tp.normalizedPosition().y());
             int w = toFixed(tp.ellipseDiameters().width());
             int h = toFixed(tp.ellipseDiameters().height());
             int vx = toFixed(tp.velocity().x());