Adapt to 6.8

Task-number: PYSIDE-2620
Task-number: QTBUG-125719
Change-Id: I6efeb1770c9bd7cddc3dbd91ca6294b9fddc9cc9
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

2 files changed, 53 insertions, 166 deletions

diff --git a/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt b/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt
index 59cef220b..b32c39f88 100644
--- a/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt
@@ -11,6 +11,10 @@ set(QtGraphs_SRC
 # 3D
 ${QtGraphs_GEN_DIR}/qabstract3daxis_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qcategory3daxis_wrapper.cpp
+${QtGraphs_GEN_DIR}/qtgraphs3d_wrapper.cpp
+${QtGraphs_GEN_DIR}/qgraphsline_wrapper.cpp
+${QtGraphs_GEN_DIR}/qgraphstheme_wrapper.cpp
+${QtGraphs_GEN_DIR}/qgraphsthemedirtybitfield_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qlogvalue3daxisformatter_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qvalue3daxis_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qvalue3daxisformatter_wrapper.cpp
@@ -26,33 +30,31 @@ ${QtGraphs_GEN_DIR}/qheightmapsurfacedataproxy_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qitemmodelbardataproxy_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qitemmodelscatterdataproxy_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qitemmodelsurfacedataproxy_wrapper.cpp
+${QtGraphs_GEN_DIR}/qlegenddata_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qscatter3dseries_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qscatterdataitem_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qscatterdataproxy_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qsurface3dseries_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qsurfacedataitem_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qsurfacedataproxy_wrapper.cpp
-${QtGraphs_GEN_DIR}/q3dbars_wrapper.cpp
-${QtGraphs_GEN_DIR}/q3dscatter_wrapper.cpp
 ${QtGraphs_GEN_DIR}/q3dscene_wrapper.cpp
-${QtGraphs_GEN_DIR}/q3dsurface_wrapper.cpp
-${QtGraphs_GEN_DIR}/qabstract3dgraph_wrapper.cpp
-${QtGraphs_GEN_DIR}/q3dinputhandler_wrapper.cpp
-${QtGraphs_GEN_DIR}/qabstract3dinputhandler_wrapper.cpp
-${QtGraphs_GEN_DIR}/qtouch3dinputhandler_wrapper.cpp
-${QtGraphs_GEN_DIR}/q3dtheme_wrapper.cpp
 # 2D
-${QtGraphs_GEN_DIR}/qbarcategoryaxis_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qabstractaxis_wrapper.cpp
-${QtGraphs_GEN_DIR}/qvalueaxis_wrapper.cpp
-${QtGraphs_GEN_DIR}/qabstractbarseries_wrapper.cpp
+${QtGraphs_GEN_DIR}/qabstractseries_wrapper.cpp
+${QtGraphs_GEN_DIR}/qareaseries_wrapper.cpp
+${QtGraphs_GEN_DIR}/qbarcategoryaxis_wrapper.cpp
+${QtGraphs_GEN_DIR}/qbarmodelmapper_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qbarseries_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qbarset_wrapper.cpp
+${QtGraphs_GEN_DIR}/qdatetimeaxis_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qlineseries_wrapper.cpp
-${QtGraphs_GEN_DIR}/qabstractseries_wrapper.cpp
+${QtGraphs_GEN_DIR}/qpiemodelmapper_wrapper.cpp
+${QtGraphs_GEN_DIR}/qpieseries_wrapper.cpp
+${QtGraphs_GEN_DIR}/qpieslice_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qscatterseries_wrapper.cpp
-${QtGraphs_GEN_DIR}/qgraphtheme_wrapper.cpp
-${QtGraphs_GEN_DIR}/qseriestheme_wrapper.cpp
+${QtGraphs_GEN_DIR}/qsplineseries_wrapper.cpp
+${QtGraphs_GEN_DIR}/qvalueaxis_wrapper.cpp
+${QtGraphs_GEN_DIR}/qxymodelmapper_wrapper.cpp
 ${QtGraphs_GEN_DIR}/qxyseries_wrapper.cpp
 # module is always needed
 ${QtGraphs_GEN_DIR}/qtgraphs_module_wrapper.cpp
@@ -63,26 +65,22 @@ set(QtGraphs_include_dirs ${QtGraphs_SOURCE_DIR}
                           ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS}
                           ${Qt${QT_MAJOR_VERSION}QtNetwork_INCLUDE_DIRS}
                           ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS}
-                          ${Qt${QT_MAJOR_VERSION}Widgets_INCLUDE_DIRS}
                           ${Qt${QT_MAJOR_VERSION}Qml_INCLUDE_DIRS}
                           ${Qt${QT_MAJOR_VERSION}Quick_INCLUDE_DIRS}
-                          ${Qt${QT_MAJOR_VERSION}QuickWidgets_INCLUDE_DIRS}
                           ${Qt${QT_MAJOR_VERSION}Graphs_INCLUDE_DIRS}
                           ${Qt${QT_MAJOR_VERSION}Quick3D_INCLUDE_DIRS}
                           ${libpyside_SOURCE_DIR}
                           ${QtCore_GEN_DIR}
                           ${QtNetwork_GEN_DIR}
                           ${QtGui_GEN_DIR}
-                          ${QtWidgets_GEN_DIR}
                           ${QtQml_GEN_DIR}
                           ${QtQuick_GEN_DIR}
-                          ${QtQuickWidgets_GEN_DIR}
                           ${QtQuick3D_GEN_DIR})
 
 set(QtGraphs_libraries    pyside6
                           ${Qt${QT_MAJOR_VERSION}Graphs_LIBRARIES})
 
-set(QtGraphs_deps QtCore QtNetwork QtGui QtWidgets QtQml QtQuick QtQuickWidgets QtQuick3D)
+set(QtGraphs_deps QtCore QtNetwork QtGui QtQml QtQuick QtQuick3D)
 
 check_qt_opengl("Graphs" QtGraphs_include_dirs QtGraphs_deps
                 QtGraphs_DROPPED_ENTRIES)
diff --git a/sources/pyside6/PySide6/QtGraphs/typesystem_graphs.xml b/sources/pyside6/PySide6/QtGraphs/typesystem_graphs.xml
index 43e4458be..a582ece66 100644
--- a/sources/pyside6/PySide6/QtGraphs/typesystem_graphs.xml
+++ b/sources/pyside6/PySide6/QtGraphs/typesystem_graphs.xml
@@ -10,11 +10,26 @@
       <include file-name="qtgraphs_helper.h" location="global"/>
    </extra-includes>
 
+  <load-typesystem name="QtQuick/typesystem_quick.xml" generate="no" />
+
   <load-typesystem name="templates/datavisualization_common.xml" generate="no" />
-  <load-typesystem name="QtQuickWidgets/typesystem_quickwidgets.xml" generate="no" />
 
   <function signature="qDefaultSurfaceFormat(bool)"/>
 
+   <namespace-type name="QtGraphs3D">
+     <enum-type name="ElementType"/>
+     <enum-type name="GridLineType"/>
+     <enum-type name="OptimizationHint" flags="OptimizationHints"/>
+     <enum-type name="RenderingMode"/>
+     <enum-type name="SelectionFlag" flags="SelectionFlags"/>
+     <enum-type name="ShadowQuality"/>
+     <enum-type name="CameraPreset" since="6.7"/>
+   </namespace-type>
+
+   <value-type name="QGraphsLine" since="6.8">
+       <modify-function signature="create(QJSValue)" remove="all"/>
+       <modify-function signature="swap(QGraphsLine&amp;)" remove="all"/>
+   </value-type>
 
   <object-type name="QAbstract3DAxis">
     <enum-type name="AxisOrientation"/>
@@ -44,6 +59,7 @@
   <object-type name="QAbstractDataProxy">
     <enum-type name="DataType"/>
   </object-type>
+  <object-type name="QAreaSeries" since="6.8"/>
   <object-type name="QBar3DSeries">
     <modify-function signature="setDataProxy(QBarDataProxy*)">
       <modify-argument index="1">
@@ -53,7 +69,9 @@
   </object-type>
   <value-type name="QBarDataItem"/>
   <object-type name="QBarDataProxy">
+      <enum-type name="RemoveLabels" since="6.8"/>
   </object-type>
+  <object-type name="QBarModelMapper" since="6.8"/>
   <object-type name="QCustom3DItem"/>
   <object-type name="QCustom3DLabel"/>
   <object-type name="QCustom3DVolume">
@@ -63,6 +81,7 @@
                        snippet="qcustom3dvolume-settexturedata"/>
       </add-function>
   </object-type>
+  <object-type name="QDateTimeAxis" since="6.8"/>
   <object-type name="QHeightMapSurfaceDataProxy"/>
   <object-type name="QItemModelBarDataProxy">
     <enum-type name="MultiMatchBehavior"/>
@@ -71,6 +90,7 @@
   <object-type name="QItemModelSurfaceDataProxy">
     <enum-type name="MultiMatchBehavior"/>
   </object-type>
+  <value-type name="QLegendData" since="6.8"/>
   <object-type name="QScatter3DSeries">
     <modify-function signature="setDataProxy(QScatterDataProxy*)">
       <modify-argument index="1">
@@ -78,10 +98,17 @@
       </modify-argument>
     </modify-function>
   </object-type>
+  <object-type name="QPieModelMapper" since="6.8"/>
+  <object-type name="QPieSeries" since="6.8"/>
+  <object-type name="QPieSlice" since="6.8">
+      <enum-type name="LabelPosition"/>
+  </object-type>
   <value-type name="QScatterDataItem"/>
   <object-type name="QScatterDataProxy">
   </object-type>
+  <object-type name="QSplineSeries" since="6.8"/>
   <object-type name="QSurface3DSeries">
+    <enum-type name="Shading" since="6.8"/>
     <enum-type name="DrawFlag" flags="DrawFlags"/>
     <modify-function signature="QSurface3DSeries(QSurfaceDataProxy*,QObject*)">
       <modify-argument index="1">
@@ -109,148 +136,15 @@
         ``deltaZ``, respectively.
         </inject-documentation>
     </add-function>
-
-  </object-type>
-  <object-type name="Q3DBars">
-    <modify-function signature="addAxis(QAbstract3DAxis*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="releaseAxis(QAbstract3DAxis*)">
-      <modify-argument index="1">
-        <reference-count action="set"/>
-      </modify-argument>
-      <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/>
-    </modify-function>
-    <modify-function signature="setColumnAxis(QCategory3DAxis*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setRowAxis(QCategory3DAxis*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-  <object-type name="Q3DScatter">
-    <modify-function signature="addAxis(QValue3DAxis*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="releaseAxis(QValue3DAxis*)">
-      <modify-argument index="1">
-        <reference-count action="set"/>
-      </modify-argument>
-      <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/>
-    </modify-function>
-    <modify-function signature="setAxisX(QValue3DAxis*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setAxisY(QValue3DAxis*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setAxisZ(QValue3DAxis*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
   </object-type>
   <object-type name="Q3DScene"/>
-  <object-type name="Q3DSurface">
-    <modify-function signature="addAxis(QValue3DAxis*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="releaseAxis(QValue3DAxis*)">
-      <modify-argument index="1">
-        <reference-count action="set"/>
-      </modify-argument>
-      <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/>
-    </modify-function>
-    <modify-function signature="setAxisX(QValue3DAxis*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setAxisY(QValue3DAxis*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setAxisZ(QValue3DAxis*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-  <object-type name="QAbstract3DGraph">
-    <enum-type name="ElementType"/>
-    <enum-type name="OptimizationHint" flags="OptimizationHints"/>
-    <enum-type name="RenderingMode"/>
-    <enum-type name="SelectionFlag" flags="SelectionFlags"/>
-    <enum-type name="ShadowQuality"/>
-    <enum-type name="CameraPreset" since="6.7"/>
-    <modify-function signature="addCustomItem(QCustom3DItem*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="addInputHandler(QAbstract3DInputHandler*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="addTheme(Q3DTheme*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="releaseCustomItem(QCustom3DItem*)">
-      <modify-argument index="1">
-        <reference-count action="set"/>
-      </modify-argument>
-      <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/>
-    </modify-function>
-    <modify-function signature="releaseInputHandler(QAbstract3DInputHandler*)">
-      <modify-argument index="1">
-        <reference-count action="set"/>
-      </modify-argument>
-      <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/>
-    </modify-function>
-    <modify-function signature="releaseTheme(Q3DTheme*)">
-      <modify-argument index="1">
-        <reference-count action="set"/>
-      </modify-argument>
-      <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/>
-    </modify-function>
-    <modify-function signature="setActiveInputHandler(QAbstract3DInputHandler*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="setActiveTheme(Q3DTheme*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-  <object-type name="Q3DInputHandler"/>
-  <object-type name="QAbstract3DInputHandler">
-    <enum-type name="InputView"/>
-  </object-type>
-  <object-type name="QTouch3DInputHandler"/>
-  <object-type name="Q3DTheme">
+  <object-type name="QGraphsTheme" since="6.8">
+    <enum-type name="ColorScheme"/>
     <enum-type name="ColorStyle"/>
+    <enum-type name="ForceTheme"/>
     <enum-type name="Theme"/>
   </object-type>
+  <value-type name="QGraphsThemeDirtyBitField" since="6.8"/>
 
   <!-- 2D -->
   <object-type name="QBarCategoryAxis"/>
@@ -258,8 +152,9 @@
     <enum-type name="AxisType"/>
   </object-type>
   <object-type name="QValueAxis"/>
-  <object-type name="QAbstractBarSeries">
+  <object-type name="QBarSeries">
     <enum-type name="LabelsPosition"/>
+    <enum-type name="BarsType" since="6.8"/>
     <modify-function signature="append(QBarSet*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -270,7 +165,7 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="insert(int,QBarSet*)">
+    <modify-function signature="insert(qsizetype,QBarSet*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
       </modify-argument>
@@ -281,19 +176,13 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QBarSeries"/>
   <object-type name="QBarSet"/>
   <object-type name="QLineSeries"/>
   <object-type name="QAbstractSeries">
     <enum-type name="SeriesType"/>
   </object-type>
   <object-type name="QScatterSeries"/>
-  <object-type name="QGraphTheme">
-    <enum-type name="ColorTheme"/>
-  </object-type>
-  <object-type name="QSeriesTheme">
-    <enum-type name="SeriesColorTheme"/>
-  </object-type>
+  <object-type name="QXYModelMapper" since="6.8"/>
   <object-type name="QXYSeries">
   </object-type>