From 69c19662bbb0de20374116a38ef673f8dc44b053 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 15 May 2018 11:12:39 +0200
Subject: QtGui: Remove duplicate entry for QAccessible, take 2

Join the remaining entries.
Amends e8291778cd1bab2679033cecf3f756bb2d2935ab.

Change-Id: I5bb0b129fc92158a16470fcab1826f7a6ea02203
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index 6d69f6b4c..47bf62992 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -223,7 +223,8 @@
     </conversion-rule>
   </primitive-type>
 
-  <value-type name="QAccessible" copyable="false">
+  <value-type name="QAccessible">
+      <value-type name="State"/>
       <enum-type name="Event"/>
       <enum-type name="Role"/>
       <enum-type name="Text"/>
@@ -233,6 +234,7 @@
   </value-type>
 
   <object-type name="QAccessibleEditableTextInterface"/>
+  <object-type name="QAccessibleInterface"/>
   <object-type name="QAccessibleObject"/>
   <object-type name="QAccessibleTableCellInterface"/>
   <object-type name="QAccessibleTextInterface"/>
@@ -3299,17 +3301,6 @@
 
   </object-type>
 
-  <value-type name="QAccessible">
-      <value-type name="State"/>
-      <enum-type name="Role"/>
-      <enum-type name="Text"/>
-      <enum-type name="RelationFlag"/>
-      <enum-type name="InterfaceType"/>
-      <enum-type name="TextBoundaryType"/>
-      <enum-type name="Event"/>
-  </value-type>
-  <object-type name="QAccessibleInterface">
-  </object-type>
   <object-type name="QOpenGLBuffer" since="5.0">
     <enum-type name="Access" />
     <enum-type name="RangeAccessFlag" flags="RangeAccessFlags" />
-- 
cgit v1.2.3