Update dependencies

- QOpenGLEXtensions now private API in GUI
- Removed support for tessellation in GL 3
- Use QMouseEvent position
- Removed use of QDesktopWidget
- Adapt to change in QQuickWindow API

Change-Id: I79df8780b9d02c6d2a3620529f5f41daec7120fe
Reviewed-by: Mike Krus <mike.krus@kdab.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/src/input/backend/mousedevice.cpp b/src/input/backend/mousedevice.cpp
index 5c4ebf6ab..79c7fb2fa 100644
--- a/src/input/backend/mousedevice.cpp
+++ b/src/input/backend/mousedevice.cpp
@@ -161,11 +161,11 @@ void MouseDevice::updateMouseEvents(const QList<QT_PREPEND_NAMESPACE(QMouseEvent
             m_mouseState.rightPressed = e.buttons() & (Qt::RightButton);
             const bool pressed = m_mouseState.leftPressed || m_mouseState.centerPressed || m_mouseState.rightPressed;
             if (m_updateAxesContinuously || (m_wasPressed && pressed)) {
-                m_mouseState.xAxis += m_sensitivity * (e.screenPos().x() - m_previousPos.x());
-                m_mouseState.yAxis += m_sensitivity * (m_previousPos.y() - e.screenPos().y());
+                m_mouseState.xAxis += m_sensitivity * float(e.globalPosition().x() - m_previousPos.x());
+                m_mouseState.yAxis += m_sensitivity * float(m_previousPos.y() - e.globalPosition().y());
             }
             m_wasPressed = pressed;
-            m_previousPos = e.screenPos();
+            m_previousPos = e.globalPosition();
         }
     }
 }
diff --git a/src/input/frontend/qmouseevent.h b/src/input/frontend/qmouseevent.h
index ae44d9365..a663c2e44 100644
--- a/src/input/frontend/qmouseevent.h
+++ b/src/input/frontend/qmouseevent.h
@@ -84,8 +84,8 @@ public:
     explicit QMouseEvent(const QT_PREPEND_NAMESPACE(QMouseEvent) &e);
     ~QMouseEvent();
 
-    inline int x() const { return m_event.x(); }
-    inline int y() const { return m_event.y(); }
+    inline int x() const { return int(m_event.position().x()); }
+    inline int y() const { return int(m_event.position().y()); }
     inline bool wasHeld() const {
 #if QT_CONFIG(gestures)
       return static_cast<Qt::GestureType>(m_event.type()) == Qt::TapAndHoldGesture;