From 443d3d036b062fddec85d8258f9af3852fdfd173 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 23 Jun 2020 11:46:26 +0200
Subject: PySide2: Add QByteArray::FromBase64Result

Change-Id: I348bb01c52482059b6f6bfebcc1d15fb68b9b142
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/pyside2/PySide2/QtCore/CMakeLists.txt             | 6 ++++++
 sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'sources')

diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt
index cfba8d3f1..20ed65a67 100644
--- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt
@@ -197,6 +197,12 @@ if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_EQUAL 5.14.0
          ${QtCore_GEN_DIR}/qrecursivemutex_wrapper.cpp)
 endif()
 
+if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_EQUAL 5.15.0
+    OR Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 5.15.0)
+    list(APPEND QtCore_SRC
+         ${QtCore_GEN_DIR}/qbytearray_frombase64result_wrapper.cpp)
+endif()
+
 set(QtCore_glue_sources
     "${QtCore_SOURCE_DIR}/glue/qeasingcurve_glue.cpp"
     "${QtCore_SOURCE_DIR}/glue/qeasingcurve_glue.h"
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 4995e196d..829e38551 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -1888,6 +1888,8 @@
   </value-type>
   <value-type name="QByteArray" hash-function="qHash">
     <enum-type name="Base64Option" flags="Base64Options" since="5.2"/>
+    <enum-type name="Base64DecodingStatus" since="5.15"/>
+    <value-type name="FromBase64Result" since="5.15"/>
     <conversion-rule>
         <target-to-native>
             <add-conversion type="Py_None" file="../glue/qtcore.cpp" snippet="conversion-pynone"/>
-- 
cgit v1.2.3