From a483896287c3af3bedc749a1b7f2a03c969a1ef8 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 13 Jul 2020 09:37:39 +0200
Subject: Adapt to refactored pointer event hierarchy

Add/remove classes for qtbase/4e400369c08db251cd489fec1229398c224d02b4.

Change-Id: I9494c7b191e5745ec8e31ada041ccadf87d3edf9
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/pyside2/PySide2/QtGui/CMakeLists.txt            |  3 ++-
 sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'sources')

diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
index f574b8081..212038349 100644
--- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
@@ -47,6 +47,7 @@ ${QtGui_GEN_DIR}/qdragleaveevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qdragmoveevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qdropevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qenterevent_wrapper.cpp
+${QtGui_GEN_DIR}/qeventpoint_wrapper.cpp
 ${QtGui_GEN_DIR}/qexposeevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qfileopenevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qfocusevent_wrapper.cpp
@@ -131,6 +132,7 @@ ${QtGui_GEN_DIR}/qresizeevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qsessionmanager_wrapper.cpp
 ${QtGui_GEN_DIR}/qshortcutevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qshowevent_wrapper.cpp
+${QtGui_GEN_DIR}/qsinglepointevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qstandarditem_wrapper.cpp
 ${QtGui_GEN_DIR}/qstandarditemmodel_wrapper.cpp
 ${QtGui_GEN_DIR}/qstatustipevent_wrapper.cpp
@@ -182,7 +184,6 @@ ${QtGui_GEN_DIR}/qtexttablecell_wrapper.cpp
 ${QtGui_GEN_DIR}/qtexttablecellformat_wrapper.cpp
 ${QtGui_GEN_DIR}/qtexttableformat_wrapper.cpp
 ${QtGui_GEN_DIR}/qtoolbarchangeevent_wrapper.cpp
-${QtGui_GEN_DIR}/qtouchevent_touchpoint_wrapper.cpp
 ${QtGui_GEN_DIR}/qtouchevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qtransform_wrapper.cpp
 ${QtGui_GEN_DIR}/qt_wrapper.cpp
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index 06ea29d14..3344f0871 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -1375,6 +1375,9 @@
       <enum-type name="Reason"/>
   </object-type>
 
+  <value-type name="QEventPoint" since="6.0">
+      <enum-type name="State"/>
+  </value-type>
   <object-type name="QDragEnterEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragEnter"/>
   <object-type name="QDragLeaveEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragLeave"/>
   <object-type name="QDragMoveEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragMove"/>
@@ -1410,6 +1413,7 @@
   <object-type name="QShortcutEvent" copyable = "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Shortcut">
   </object-type>
   <object-type name="QShowEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Show"/>
+  <object-type name="QSinglePointEvent" copyable="false" since="6.0"/>
   <object-type name="QStatusTipEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::StatusTip"/>
   <object-type name="QTabletEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::TabletMove || %1-&gt;type() == QEvent::TabletPress || %1-&gt;type() == QEvent::TabletRelease"/>
   <object-type name="QToolBarChangeEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::ToolBarChange"/>
@@ -2313,11 +2317,7 @@
     <modify-function signature="getEulerAngles(float*,float*,float*)const" since="5.5" remove="all"/>
   </value-type>
 
-  <object-type name="QTouchEvent" since="4.6">
-      <value-type name="TouchPoint" since="4.6">
-        <enum-type name="InfoFlag" flags="InfoFlags"/>
-      </value-type>
-  </object-type>
+  <object-type name="QTouchEvent" since="4.6"/>
 
   <object-type name="QInputDevice">
     <enum-type name="Capability" flags="Capabilities"/>
-- 
cgit v1.2.3