From e8291778cd1bab2679033cecf3f756bb2d2935ab Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 11 May 2018 10:35:28 +0200
Subject: Add more QtGui classes

Add QAccessible, acccessibility events and interfaces.
Fix the polymorphic-id-expression of the acccessibility events;
they no longer inherit QEvent in Qt 5.
Add QInputMethod, QInputMethodQueryEvent, QNativeGestureEvent,
QScrollEvent, QScrollPrepareEvent, QOpenGLTextureBlitter
and QPointingDeviceUniqueId.

Task-number: PYSIDE-487
Change-Id: I609ece08cbab78d2fe75eaf6cb0b10531aac9b25
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 sources/pyside2/PySide2/QtGui/CMakeLists.txt       | 21 +++++++++++
 .../PySide2/QtGui/typesystem_gui_common.xml        | 43 ++++++++++++++++++++--
 2 files changed, 61 insertions(+), 3 deletions(-)

(limited to 'sources/pyside2/PySide2/QtGui')

diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
index 807f9b31e..529e8e916 100644
--- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
@@ -7,7 +7,21 @@ ${QtGui_GEN_DIR}/qabstractopenglfunctions_wrapper.cpp
 ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_paintcontext_wrapper.cpp
 ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_selection_wrapper.cpp
 ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_wrapper.cpp
+${QtGui_GEN_DIR}/qaccessible_wrapper.cpp
+${QtGui_GEN_DIR}/qaccessibleeditabletextinterface_wrapper.cpp
 ${QtGui_GEN_DIR}/qaccessibleevent_wrapper.cpp
+${QtGui_GEN_DIR}/qaccessibleobject_wrapper.cpp
+${QtGui_GEN_DIR}/qaccessiblestatechangeevent_wrapper.cpp
+${QtGui_GEN_DIR}/qaccessibletablecellinterface_wrapper.cpp
+${QtGui_GEN_DIR}/qaccessibletablemodelchangeevent_wrapper.cpp
+${QtGui_GEN_DIR}/qaccessibletextcursorevent_wrapper.cpp
+${QtGui_GEN_DIR}/qaccessibletextinsertevent_wrapper.cpp
+${QtGui_GEN_DIR}/qaccessibletextinterface_wrapper.cpp
+${QtGui_GEN_DIR}/qaccessibletextremoveevent_wrapper.cpp
+${QtGui_GEN_DIR}/qaccessibletextselectionevent_wrapper.cpp
+${QtGui_GEN_DIR}/qaccessibletextupdateevent_wrapper.cpp
+${QtGui_GEN_DIR}/qaccessiblevaluechangeevent_wrapper.cpp
+${QtGui_GEN_DIR}/qaccessiblevalueinterface_wrapper.cpp
 ${QtGui_GEN_DIR}/qactionevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qbackingstore_wrapper.cpp
 ${QtGui_GEN_DIR}/qbitmap_wrapper.cpp
@@ -48,8 +62,10 @@ ${QtGui_GEN_DIR}/qimageiohandler_wrapper.cpp
 ${QtGui_GEN_DIR}/qimagereader_wrapper.cpp
 ${QtGui_GEN_DIR}/qimagewriter_wrapper.cpp
 ${QtGui_GEN_DIR}/qinputevent_wrapper.cpp
+${QtGui_GEN_DIR}/qinputmethod_wrapper.cpp
 ${QtGui_GEN_DIR}/qinputmethodevent_attribute_wrapper.cpp
 ${QtGui_GEN_DIR}/qinputmethodevent_wrapper.cpp
+${QtGui_GEN_DIR}/qinputmethodqueryevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qintvalidator_wrapper.cpp
 ${QtGui_GEN_DIR}/qkeyevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qkeysequence_wrapper.cpp
@@ -67,6 +83,7 @@ ${QtGui_GEN_DIR}/qmatrix4x4_wrapper.cpp
 ${QtGui_GEN_DIR}/qmouseevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qmoveevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qmovie_wrapper.cpp
+${QtGui_GEN_DIR}/qnativegestureevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qoffscreensurface_wrapper.cpp
 ${QtGui_GEN_DIR}/qopenglcontextgroup_wrapper.cpp
 ${QtGui_GEN_DIR}/qopengldebuglogger_wrapper.cpp
@@ -78,6 +95,7 @@ ${QtGui_GEN_DIR}/qopenglfunctions_wrapper.cpp
 ${QtGui_GEN_DIR}/qopenglpixeltransferoptions_wrapper.cpp
 ${QtGui_GEN_DIR}/qopenglshaderprogram_wrapper.cpp
 ${QtGui_GEN_DIR}/qopengltexture_wrapper.cpp
+${QtGui_GEN_DIR}/qopengltextureblitter_wrapper.cpp
 ${QtGui_GEN_DIR}/qopengltimemonitor_wrapper.cpp
 ${QtGui_GEN_DIR}/qopengltimerquery_wrapper.cpp
 ${QtGui_GEN_DIR}/qopenglversionprofile_wrapper.cpp
@@ -107,6 +125,7 @@ ${QtGui_GEN_DIR}/qpixmap_wrapper.cpp
 ${QtGui_GEN_DIR}/qpixmapcache_key_wrapper.cpp
 ${QtGui_GEN_DIR}/qpixmapcache_wrapper.cpp
 ${QtGui_GEN_DIR}/qpixelformat_wrapper.cpp
+${QtGui_GEN_DIR}/qpointingdeviceuniqueid_wrapper.cpp
 ${QtGui_GEN_DIR}/qpolygon_wrapper.cpp
 ${QtGui_GEN_DIR}/qpolygonf_wrapper.cpp
 ${QtGui_GEN_DIR}/qpytextobject_wrapper.cpp
@@ -132,6 +151,8 @@ ${QtGui_GEN_DIR}/qopenglshader_wrapper.cpp
 ${QtGui_GEN_DIR}/qopenglframebufferobject_wrapper.cpp
 ${QtGui_GEN_DIR}/qrasterwindow_wrapper.cpp
 ${QtGui_GEN_DIR}/qrawfont_wrapper.cpp
+${QtGui_GEN_DIR}/qscrollevent_wrapper.cpp
+${QtGui_GEN_DIR}/qscrollprepareevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qstatictext_wrapper.cpp
 ${QtGui_GEN_DIR}/qstylehints_wrapper.cpp
 ${QtGui_GEN_DIR}/qsurface_wrapper.cpp
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index 903260200..a9815cf67 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -119,7 +119,7 @@
     besides the fact they are accessible by ordinary event methods.
     -->
 
-  <rejection class="QAccessibleEvent" field-name="m_type"/>
+  <rejection class="^QAccessible.*Event$" field-name="^m_.*$"/>
 
   <rejection class="QEnterEvent" field-name="l"/>
   <rejection class="QEnterEvent" field-name="w"/>
@@ -132,6 +132,7 @@
   <rejection class="QMouseEvent" field-name="g"/>
   <rejection class="QMouseEvent" field-name="b"/>
   <rejection class="QMouseEvent" field-name="mouseState"/>
+  <rejection class="QNativeGestureEvent" field-name="^m.*$"/>
 
   <rejection class="QHoverEvent" field-name="p"/>
   <rejection class="QHoverEvent" field-name="op"/>
@@ -222,6 +223,33 @@
     </conversion-rule>
   </primitive-type>
 
+  <value-type name="QAccessible" copyable="false">
+      <enum-type name="Event"/>
+      <enum-type name="Role"/>
+      <enum-type name="Text"/>
+      <enum-type name="RelationFlag" flags="Relation"/>
+      <enum-type name="InterfaceType"/>
+      <enum-type name="TextBoundaryType"/>
+  </value-type>
+
+  <object-type name="QAccessibleEditableTextInterface"/>
+  <object-type name="QAccessibleObject"/>
+  <object-type name="QAccessibleTableCellInterface"/>
+  <object-type name="QAccessibleTextInterface"/>
+  <object-type name="QAccessibleValueInterface"/>
+
+  <object-type name="QAccessibleEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QAccessible::InvalidEvent"/>
+  <object-type name="QAccessibleStateChangeEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QAccessible::StateChanged"/>
+  <object-type name="QAccessibleTableModelChangeEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QAccessible::TableModelChanged">
+      <enum-type name="ModelChangeType"/>
+  </object-type>
+  <object-type name="QAccessibleTextCursorEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QAccessible::TextCaretMoved"/>
+  <object-type name="QAccessibleTextInsertEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QAccessible::TextInserted"/>
+  <object-type name="QAccessibleTextRemoveEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QAccessible::TextRemoved"/>
+  <object-type name="QAccessibleTextSelectionEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QAccessible::TextSelectionChanged"/>
+  <object-type name="QAccessibleTextUpdateEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QAccessible::TextUpdated"/>
+  <object-type name="QAccessibleValueChangeEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QAccessible::ValueChanged"/>
+
   <value-type name="QTransform">
     <enum-type name="TransformationType"/>
     <add-function signature="__repr__" return-type="PyObject*">
@@ -383,6 +411,9 @@
     <enum-type name="ColorGroup" />
     <enum-type name="ColorRole" />
   </value-type>
+  <object-type name="QInputMethod">
+      <enum-type name="Action" />
+  </object-type>
   <value-type name="QKeySequence">
     <enum-type name="SequenceFormat"/>
     <enum-type name="SequenceMatch"/>
@@ -1782,8 +1813,10 @@
     </value-type>
     <!-- endif ndef QT_NO_INPUTMETHOD -->
   </object-type>
+  <object-type name="QInputMethodQueryEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::InputMethodQuery"/>
 
   <object-type name="QMoveEvent" copyable = "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Move" />
+  <object-type name="QNativeGestureEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::NativeGesture"/>
   <object-type name="QResizeEvent" copyable = "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Resize"/>
   <object-type name="QShortcutEvent" copyable = "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Shortcut">
   </object-type>
@@ -1813,7 +1846,10 @@
   </object-type>
   <object-type name="QMouseEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::MouseButtonDblClick || %1-&gt;type() == QEvent::MouseButtonPress || %1-&gt;type() == QEvent::MouseButtonRelease || %1-&gt;type() == QEvent::MouseMove"/>
   <object-type name="QPaintEvent" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Paint"/>
-  <object-type name="QAccessibleEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::AccessibilityDescription || %1-&gt;type() == QEvent::AccessibilityHelp"/>
+  <object-type name="QScrollEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::Scroll">
+      <enum-type name="ScrollState"/>
+  </object-type>
+  <object-type name="QScrollPrepareEvent" copyable="false" polymorphic-id-expression="%1-&gt;type() == QEvent::ScrollPrepare"/>
 
   <object-type name="QTextFrame" >
     <extra-includes>
@@ -3056,7 +3092,6 @@
 
     _______ end of matrix block _______ -->
 
-
   <value-type name="QQuaternion" since="4.6">
     <add-function signature="__repr__" return-type="PyObject*">
         <inject-code class="target" position="beginning">
@@ -3661,6 +3696,7 @@
       <modify-function signature="borderColor(int*)const" remove="all"/>
       <modify-function signature="borderColor(float*)const" remove="all"/>
   </object-type>
+  <object-type name="QOpenGLTextureBlitter"/>
   <object-type name="QOpenGLTimeMonitor" since="5.1"/>
   <object-type name="QOpenGLTimerQuery" since="5.1"/>
   <object-type name="QOpenGLWindow" since="5.4">
@@ -3691,6 +3727,7 @@
       <enum-type name="YUVLayout"/>
   </value-type>
   <object-type name="QPdfWriter"/>
+  <value-type name="QPointingDeviceUniqueId"/>
   <value-type name="QRawFont">
       <enum-type name="AntialiasingType"/>
       <enum-type name="LayoutFlag" flags="LayoutFlags"/>
-- 
cgit v1.2.3