From aeccae345301738e8bd9016739ce0113d40301a6 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 3 Sep 2019 14:15:54 +0200
Subject: Add bindings for Qt 5.14

Task-number: PYSIDE-487
Change-Id: I52b4c13f881599812a311f01937fde92ba4c0f3f
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
 sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml          | 1 +
 sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt               | 6 ++++++
 sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml      | 5 +++++
 sources/pyside2/PySide2/QtGui/CMakeLists.txt                    | 4 ++++
 sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml         | 9 +++++++++
 sources/pyside2/PySide2/QtQuick/typesystem_quick.xml            | 2 ++
 sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml | 2 ++
 7 files changed, 29 insertions(+)

diff --git a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml
index b7369f4a1..7d64fba55 100644
--- a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml
+++ b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml
@@ -48,6 +48,7 @@
         <object-type name="QAbstractSkeleton" since="5.10"/>
         <object-type name="QArmature" since="5.10"/>
         <object-type name="QAspectEngine">
+          <enum-type name="RunMode" since="5.14"/>
           <modify-function signature="registerAspect(Qt3DCore::QAbstractAspect*)">
             <modify-argument index="this">
               <parent index="1" action="add"/>
diff --git a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt
index 73c0c5ba6..edd023840 100644
--- a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt
+++ b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt
@@ -132,6 +132,12 @@ if (Qt53DRender_VERSION VERSION_EQUAL 5.13.0 OR Qt53DRender_VERSION VERSION_GREA
          ${Qt3DRender_GEN_DIR}/qt3drender_qwaitfence_wrapper.cpp)
 endif()
 
+if (Qt53DRender_VERSION VERSION_EQUAL 5.14.0 OR Qt53DRender_VERSION VERSION_GREATER 5.14.0)
+    list(APPEND Qt3DRender_SRC
+        ${Qt3DRender_GEN_DIR}/qt3drender_qnopicking_wrapper.cpp
+        ${Qt3DRender_GEN_DIR}/qt3drender_qshaderimage_wrapper.cpp)
+endif()
+
 set(Qt3DRender_include_dirs
                      ${Qt3DRender_SOURCE_DIR}
                      ${Qt3DRender_BINARY_DIR}
diff --git a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml
index be06a3135..477dc605d 100644
--- a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml
+++ b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml
@@ -155,6 +155,7 @@
         <object-type name="QMultiSampleAntiAliasing"/>
         <object-type name="QNoDepthMask"/>
         <object-type name="QNoDraw"/>
+        <object-type name="QNoPicking" since="5.14"/>
         <object-type name="QObjectPicker"/>
         <object-type name="QPaintedTextureImage"/>
         <object-type name="QParameter"/>
@@ -213,6 +214,10 @@
             <enum-type name="ShaderType"/>
             <enum-type name="Status"/>
         </object-type>
+        <object-type name="QShaderImage" since="5.14">
+            <enum-type name="Access"/>
+            <enum-type name="ImageFormat"/>
+        </object-type>
         <object-type name="QShaderProgramBuilder" since="5.10"/>
         <object-type name="QSharedGLTexture" since="5.13"/>
         <object-type name="QSortPolicy">
diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
index 18d80f647..9e6bd099f 100644
--- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
@@ -210,6 +210,10 @@ ${QtGui_GEN_DIR}/qwindowstatechangeevent_wrapper.cpp
 ${QtGui_GEN_DIR}/qtgui_module_wrapper.cpp
 )
 
+if (Qt5Gui_VERSION VERSION_EQUAL 5.14.0 OR Qt5Gui_VERSION VERSION_GREATER 5.14.0)
+    list(APPEND QtGui_SRC ${QtGui_GEN_DIR}/qcolorspace_wrapper.cpp)
+endif()
+
 # cf qtbase/src/gui/opengl/opengl.pri
 list(FIND QtGui_enabled_features "opengles2" _opengles2Index)
 # ### fixme: For cmake >= 3.3: if(opengles2 IN_LIST QtGui_enabled_features)
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index ab40e3953..b1090b651 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -480,6 +480,7 @@
   </value-type>
   <value-type name="QTextBlockFormat">
     <enum-type name="LineHeightTypes" since="4.8" revision="4800"/>
+    <enum-type name="MarkerType" since="5.14"/>
   </value-type>
   <value-type name="QTextTableCellFormat"/>
   <value-type name="QTextCharFormat" >
@@ -1094,6 +1095,13 @@
         </inject-code>
     </modify-function>
   </value-type>
+
+  <value-type name="QColorSpace" since="5.14">
+      <enum-type name="NamedColorSpace"/>
+      <enum-type name="Primaries"/>
+      <enum-type name="TransferFunction"/>
+  </value-type>
+
   <value-type name="QFontMetricsF" >
 
     <modify-function signature="boundingRect(QChar)const" rename="boundingRectChar">
@@ -1749,6 +1757,7 @@
       <include file-name="QTextCursor" location="global"/>
     </extra-includes>
     <enum-type name="FindFlag" flags="FindFlags"/>
+    <enum-type name="MarkdownFeature" flags="MarkdownFeatures" since="5.14"/>
     <enum-type name="MetaInformation"/>
     <enum-type name="ResourceType"/>
     <enum-type name="Stacks" since="4.7"/>
diff --git a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
index 64b4e8412..7a18dac54 100644
--- a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
+++ b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
@@ -100,6 +100,7 @@
 
     <object-type name="QQuickWindow">
         <enum-type name="CreateTextureOption" flags="CreateTextureOptions"/>
+        <enum-type name="NativeObjectType" since="5.14"/>
         <enum-type name="RenderStage"/>
         <enum-type name="SceneGraphError"/>
         <enum-type name="TextRenderType" since="5.10"/>
@@ -107,6 +108,7 @@
 
     <object-type name="QSGAbstractRenderer">
         <enum-type name="ClearModeBit" flags="ClearMode"/>
+        <enum-type name="MatrixTransformFlag" flags="MatrixTransformFlags" since="5.14"/>
     </object-type>
     <object-type name="QSGBasicGeometryNode"/>
     <object-type name="QSGClipNode"/>
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
index 23fb4857e..425dcd7b5 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -461,6 +461,7 @@
     <enum-type name="SliderChange"/>
   </object-type>
   <object-type name="QActionGroup">
+    <enum-type name="ExclusionPolicy" since="5.14"/>
     <modify-function signature="addAction(QAction*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -2950,6 +2951,7 @@
   <object-type name="QCommandLinkButton"/>
   <object-type name="QFileSystemModel" polymorphic-id-expression="qobject_cast&lt;QFileSystemModel*&gt;(%1)">
     <enum-type name="Roles"/>
+    <enum-type name="Option" flags="Options" since="5.14"/>
     <modify-function signature="setIconProvider(QFileIconProvider*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
-- 
cgit v1.2.3