From 45e3909e0fb628b6283fef8ea94861b7ca87093b Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 25 Jun 2020 12:12:55 +0200
Subject: Adapt to newer dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I495880f56fbc10d8f332f26101f8a25c2a1c5631
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 src/core/web_engine_settings.cpp |  1 -
 src/core/web_event_factory.cpp   | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/core')

diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp
index edd72a117..837f05bf1 100644
--- a/src/core/web_engine_settings.cpp
+++ b/src/core/web_engine_settings.cpp
@@ -59,7 +59,6 @@
 
 #include <QFont>
 #include <QTimer>
-#include <QTouchDevice>
 
 namespace QtWebEngineCore {
 
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
index e1db69b16..428ef6068 100644
--- a/src/core/web_event_factory.cpp
+++ b/src/core/web_event_factory.cpp
@@ -82,7 +82,7 @@
 #include <QMouseEvent>
 #include <QStyleHints>
 #if QT_CONFIG(tabletevent)
-#include <QTabletEvent>
+#include <QPointingDevice>
 #endif
 #include <QWheelEvent>
 
@@ -1393,12 +1393,14 @@ static WebInputEvent::Type webEventTypeForEvent(const QEvent* event)
 static WebPointerProperties::PointerType pointerTypeForTabletEvent(const QTabletEvent *ev)
 {
     switch (ev->pointerType()) {
-    case QTabletEvent::UnknownPointer:
+    case QPointingDevice::PointerType::Unknown:
         return WebPointerProperties::PointerType::kUnknown;
-    case QTabletEvent::Pen:
+    case QPointingDevice::PointerType::Pen:
         return WebPointerProperties::PointerType::kPen;
-    case QTabletEvent::Eraser:
+    case QPointingDevice::PointerType::Eraser:
         return WebPointerProperties::PointerType::kEraser;
+    case QPointingDevice::PointerType::Finger:
+        return WebPointerProperties::PointerType::kTouch;
     default:
         return WebPointerProperties::PointerType::kMouse;
     }
-- 
cgit v1.2.3