From bf214f7495c929e5e3f6fdd4745a9daa6ab9ee1a Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 5 Jul 2018 16:00:34 +0200
Subject: Add bindings for 5.12

Task-number: PYSIDE-487
Change-Id: Ib37efc4e480a978f920d3bc40756fe7abd59cb19
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/pyside2/PySide2/QtCore/CMakeLists.txt      |  9 ++++++
 .../PySide2/QtCore/typesystem_core_common.xml      | 32 ++++++++++++++++++++++
 2 files changed, 41 insertions(+)

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

diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt
index 1d0b7d413..466e97756 100644
--- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt
@@ -28,6 +28,15 @@ ${QtCore_GEN_DIR}/qbuffer_wrapper.cpp
 ${QtCore_GEN_DIR}/qbytearray_wrapper.cpp
 ${QtCore_GEN_DIR}/qbytearraymatcher_wrapper.cpp
 ${QtCore_GEN_DIR}/qchildevent_wrapper.cpp
+${QtCore_GEN_DIR}/qcborarray_wrapper.cpp
+${QtCore_GEN_DIR}/qcborerror_wrapper.cpp
+${QtCore_GEN_DIR}/qcbormap_wrapper.cpp
+${QtCore_GEN_DIR}/qcborparsererror_wrapper.cpp
+${QtCore_GEN_DIR}/qcborstreamreader_wrapper.cpp
+${QtCore_GEN_DIR}/qcborstringresultstring_wrapper.cpp
+${QtCore_GEN_DIR}/qcborstringresultbytearray_wrapper.cpp
+${QtCore_GEN_DIR}/qcborstreamwriter_wrapper.cpp
+${QtCore_GEN_DIR}/qcborvalue_wrapper.cpp
 ${QtCore_GEN_DIR}/qcollator_wrapper.cpp
 ${QtCore_GEN_DIR}/qcollatorsortkey_wrapper.cpp
 ${QtCore_GEN_DIR}/qcommandlineoption_wrapper.cpp
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index ba141a177..9331259ca 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -176,6 +176,8 @@
 
   <enum-type name="QtMsgType"/>
 
+  <enum-type name="QCborSimpleType" since="5.12"/>
+  <enum-type name="QCborKnownTags" since="5.12"/>
 
   <primitive-type name="qint8"/>
   <primitive-type name="qint16"/>
@@ -662,6 +664,36 @@
     </conversion-rule>
   </primitive-type>
 
+  <value-type name="QCborError" since="5.12">
+      <enum-type name="Code"/>
+      <include file-name="qcborcommon.h" location="global"/>
+  </value-type>
+
+  <value-type name="QCborParserError" since="5.12">
+      <include file-name="qcborvalue.h" location="global"/>
+  </value-type>
+
+  <value-type name="QCborValue" since="5.12">
+      <enum-type name="EncodingOption" flags="EncodingOptions"/>
+      <enum-type name="DiagnosticNotationOption" flags="DiagnosticNotationOptions"/>
+      <enum-type name="Type"/>
+  </value-type>
+  <value-type name="QCborArray" since="5.12"/>
+  <value-type name="QCborMap" since="5.12"/>
+
+  <object-type name="QCborStreamReader" since="5.12">
+    <enum-type name="StringResultCode"/>
+    <enum-type name="Type"/>
+    <include file-name="qcborstream.h" location="global"/>
+    <value-type name="StringResult" generate="no"/>
+    <modify-function signature="readStringChunk(char*,long long)" remove="all"/>
+  </object-type>
+  <typedef-type name="QCborStringResultString" source="QCborStreamReader::StringResult&lt;QString&gt;"/>
+  <typedef-type name="QCborStringResultByteArray" source="QCborStreamReader::StringResult&lt;QByteArray&gt;"/>
+  <object-type name="QCborStreamWriter" since="5.12">
+    <include file-name="qcborstream.h" location="global"/>
+  </object-type>
+
   <primitive-type name="QJsonObject">
     <conversion-rule>
         <native-to-target>
-- 
cgit v1.2.3