Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I5dd997d995feae2ddf207eb213fb08233dece77c

13 files changed, 376 insertions, 57 deletions

diff --git a/missing_bindings.py b/missing_bindings.py
index 3fa97f0b5..ad7cfce52 100644
--- a/missing_bindings.py
+++ b/missing_bindings.py
@@ -376,7 +376,14 @@ for module_name in modules_to_test.keys():
     missing_types = []
     for qt_type in types_on_html_page:
         try:
-            pyside_qualified_type = 'pyside_tested_module.' + qt_type
+            pyside_qualified_type = 'pyside_tested_module.'
+
+            if "Charts" in module_name:
+                pyside_qualified_type += 'QtCharts.'
+            elif "DataVisualization" in module_name:
+                pyside_qualified_type += 'QtDataVisualization.'
+
+            pyside_qualified_type += qt_type
             o = eval(pyside_qualified_type)
         except:
             missing_type = qt_type
@@ -385,7 +392,14 @@ for module_name in modules_to_test.keys():
 
             is_present_in_pyqt = False
             try:
-                pyqt_qualified_type = 'pyqt_tested_module.' + qt_type
+                pyqt_qualified_type = 'pyqt_tested_module.'
+
+                if "Charts" in module_name:
+                    pyqt_qualified_type += 'QtCharts.'
+                elif "DataVisualization" in module_name:
+                    pyqt_qualified_type += 'QtDataVisualization.'
+
+                pyqt_qualified_type += qt_type
                 eval(pyqt_qualified_type)
                 missing_type += " (is present in PyQt5)"
                 missing_types_compared_to_pyqt += 1
diff --git a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml
index 44274766f..5fe0ac435 100644
--- a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml
+++ b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml
@@ -43,6 +43,7 @@
 <typesystem package="PySide2.Qt3DRender">
     <load-typesystem name="Qt3DCore/typesystem_3dcore.xml" generate="no"/>
     <namespace-type name="Qt3DRender">
+        <object-type name="AssimpImporter"/>
         <object-type name="PropertyReaderInterface"/>
         <object-type name="QAbstractFunctor"/>
         <object-type name="QAbstractLight">
@@ -78,10 +79,11 @@
         <object-type name="QBlendEquationArguments">
             <enum-type name="Blending"/>
         </object-type>
-        <object-type name="QBlitFramebuffer" since="5.10"/>
+        <object-type name="QBlitFramebuffer" since="5.10">
+            <enum-type name="InterpolationMethod"/>
+        </object-type>
         <object-type name="QBuffer">
             <enum-type name="AccessType"/>
-            <enum-type name="BufferType"/>
             <enum-type name="UsageType"/>
         </object-type>
         <object-type name="QBufferCapture"/>
@@ -96,7 +98,7 @@
         </object-type>
         <object-type name="QCameraSelector"/>
         <object-type name="QClearBuffers">
-            <enum-type name="BufferType"/>
+            <enum-type name="BufferType" flags="BufferTypeFlags"/>
         </object-type>
         <object-type name="QClipPlane"/>
         <object-type name="QColorMask"/>
@@ -130,8 +132,12 @@
             <enum-type name="Api"/>
             <enum-type name="OpenGLProfile"/>
         </object-type>
+        <object-type name="GLTFImporter"/>
+        <object-type name="GLTFExporter"/>
         <object-type name="QLayer"/>
-        <object-type name="QLayerFilter"/>
+        <object-type name="QLayerFilter">
+            <enum-type name="FilterMode"/>
+        </object-type>
         <object-type name="QLevelOfDetail">
             <enum-type name="ThresholdType"/>
         </object-type>
@@ -140,9 +146,11 @@
         <object-type name="QLineWidth" since="5.10"/>
         <object-type name="QMaterial"/>
         <object-type name="QMemoryBarrier">
-            <enum-type name="Operation"/>
+            <enum-type name="Operation" flags="Operations"/>
+        </object-type>
+        <object-type name="QMesh">
+            <enum-type name="Status"/>
         </object-type>
-        <object-type name="QMesh"/>
         <object-type name="QMultiSampleAntiAliasing"/>
         <object-type name="QNoDepthMask"/>
         <object-type name="QNoDraw"/>
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index cce9c7076..a82ff328e 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -426,7 +426,7 @@
             QVariant ret = QVariant_convertToVariantMap(%in);
             %out = ret.isValid() ? ret : QVariant::fromValue&lt;PySide::PyObjectWrapper&gt;(%in);
             </add-conversion>
-            <add-conversion type="PySequence">
+            <add-conversion type="PyList" check="PyList_Check(%in)">
             QVariant ret = QVariant_convertToVariantList(%in);
             %out = ret.isValid() ? ret : QVariant::fromValue&lt;PySide::PyObjectWrapper&gt;(%in);
             </add-conversion>
@@ -2134,11 +2134,6 @@
       <include file-name="QStringList" location="global"/>
       <include file-name="QSize" location="global"/>
     </extra-includes>
-    <modify-function signature="setSourceModel(QAbstractItemModel*)">
-      <modify-argument index="1">
-        <parent index="this" action="add"/>
-      </modify-argument>
-    </modify-function>
   </object-type>
   <object-type name="QSortFilterProxyModel">
     <!-- ### This reimplementation of "QObject::parent()" is used in C++ only
diff --git a/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml
index 88e796c1b..7796651c4 100644
--- a/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml
+++ b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml
@@ -118,7 +118,13 @@
     <object-type name="QCategory3DAxis"/>
     <object-type name="QLogValue3DAxisFormatter"/>
     <object-type name="QValue3DAxis"/>
-    <object-type name="QValue3DAxisFormatter"/>
+    <object-type name="QValue3DAxisFormatter">
+      <modify-function signature="populateCopy(QValue3DAxisFormatter&amp;)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+    </object-type>
     <object-type name="QAbstract3DSeries">
       <enum-type name="Mesh"/>
       <enum-type name="SeriesType"/>
@@ -126,9 +132,91 @@
     <object-type name="QAbstractDataProxy">
       <enum-type name="DataType"/>
     </object-type>
-    <object-type name="QBar3DSeries"/>
+    <object-type name="QBar3DSeries">
+      <modify-function signature="setDataProxy(QBarDataProxy*)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+    </object-type>
     <value-type name="QBarDataItem"/>
-    <object-type name="QBarDataProxy"/>
+    <object-type name="QBarDataProxy">
+      <modify-function signature="setDataProxy(QBarDataProxy*)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="resetArray(QBarDataArray*)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="resetArray(QBarDataArray*,const QStringList&amp;const QStringList&amp;)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="addRow(QBarDataRow*)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="addRow(QBarDataRow*, const QString&amp;)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="addRows(QBarDataArray&amp;)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="addRows(QBarDataArray&amp;, const QString&amp;)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="insertRow(int, QBarDataRow*)">
+        <modify-argument index="2">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="insertRow(int, QBarDataRow*, const QString&amp;)">
+        <modify-argument index="2">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="insertRows(int, QBarDataArray&amp;)">
+        <modify-argument index="2">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="insertRows(int, QBarDataArray&amp;, const QString&amp;)">
+        <modify-argument index="2">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="setRow(int, QBarDataRow*)">
+        <modify-argument index="2">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="setRow(int, QBarDataRow*, const QString&amp;)">
+        <modify-argument index="2">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="setRows(int, QBarDataArray&amp;)">
+        <modify-argument index="2">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="setRows(int, QBarDataArray&amp;, const QString&amp;)">
+        <modify-argument index="2">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+    </object-type>
     <object-type name="QCustom3DItem"/>
     <object-type name="QCustom3DLabel"/>
     <object-type name="QCustom3DVolume"/>
@@ -140,28 +228,232 @@
     <object-type name="QItemModelSurfaceDataProxy">
       <enum-type name="MultiMatchBehavior"/>
     </object-type>
-    <object-type name="QScatter3DSeries"/>
+    <object-type name="QScatter3DSeries">
+      <modify-function signature="setDataProxy(QScatterDataProxy*)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+    </object-type>
     <value-type name="QScatterDataItem"/>
-    <object-type name="QScatterDataProxy"/>
+    <object-type name="QScatterDataProxy">
+      <modify-function signature="resetArray(QScatterDataArray*)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="addItem(const QScatterDataItem&amp;)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="addItems(const QScatterDataArray&amp;)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="insertItem(int, const QScatterDataItem&amp;)">
+        <modify-argument index="2">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="insertItems(int, const QScatterDataArray&amp;)">
+        <modify-argument index="2">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="setItem(int, const QScatterDataIteItem;)">
+        <modify-argument index="2">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="setItems(int, const QScatterDataArray&amp;)">
+        <modify-argument index="2">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+    </object-type>
     <object-type name="QSurface3DSeries">
-       <enum-type name="DrawFlag" flags="DrawFlags"/>
+      <enum-type name="DrawFlag" flags="DrawFlags"/>
+      <modify-function signature="QSurface3DSeries(QSurfaceDataProxy*,QObject*)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="setDataProxy(QSurfaceDataProxy*)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
     </object-type>
     <value-type name="QSurfaceDataItem"/>
-    <object-type name="QSurfaceDataProxy"/>
-    <object-type name="Q3DBars"/>
+    <object-type name="QSurfaceDataProxy">
+      <modify-function signature="addRow(QSurfaceDataRow*)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="insertRow(int, QSurfaceDataRow*)">
+        <modify-argument index="2">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="setRow(int, QSurfaceDataRow*)">
+        <modify-argument index="2">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="resetArray(QSurfaceDataArray*)">
+        <modify-argument index="1">
+          <parent index="this" action="add"/>
+        </modify-argument>
+      </modify-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>
+          Shiboken::Object::releaseOwnership(%PYARG_1);
+        </inject-code>
+      </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="Q3DCamera">
       <enum-type name="CameraPreset"/>
     </object-type>
     <object-type name="Q3DLight"/>
     <object-type name="Q3DObject"/>
-    <object-type name="Q3DScatter"/>
+    <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>
+          Shiboken::Object::releaseOwnership(%PYARG_1);
+        </inject-code>
+      </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"/>
+    <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>
+          Shiboken::Object::releaseOwnership(%PYARG_1);
+        </inject-code>
+      </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="SelectionFlag" flags="SelectionFlags"/>
       <enum-type name="ShadowQuality"/>
+      <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>
+          Shiboken::Object::releaseOwnership(%PYARG_1);
+        </inject-code>
+      </modify-function>
+      <modify-function signature="releaseInputHandler(QAbstract3DInputHandler*)">
+        <modify-argument index="1">
+          <reference-count action="set"/>
+        </modify-argument>
+        <inject-code>
+          Shiboken::Object::releaseOwnership(%PYARG_1);
+        </inject-code>
+      </modify-function>
+      <modify-function signature="releaseTheme(Q3DTheme*)">
+        <modify-argument index="1">
+          <reference-count action="set"/>
+        </modify-argument>
+        <inject-code>
+          Shiboken::Object::releaseOwnership(%PYARG_1);
+        </inject-code>
+      </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">
diff --git a/sources/pyside2/PySide2/QtLocation/typesystem_location.xml b/sources/pyside2/PySide2/QtLocation/typesystem_location.xml
index 309652864..794c1f3ef 100644
--- a/sources/pyside2/PySide2/QtLocation/typesystem_location.xml
+++ b/sources/pyside2/PySide2/QtLocation/typesystem_location.xml
@@ -87,7 +87,9 @@
   <value-type name="QPlaceAttribute"/>
   <value-type name="QPlaceCategory"/>
   <value-type name="QPlaceContactDetail"/>
-  <value-type name="QPlaceContent"/>
+  <value-type name="QPlaceContent">
+      <enum-type name="Type"/>
+  </value-type>
   <value-type name="QPlaceContentRequest"/>
   <object-type name="QPlaceEditorial"/>
   <object-type name="QPlaceImage"/>
@@ -106,7 +108,9 @@
   <object-type name="QPlaceSearchRequest">
       <enum-type name="RelevanceHint"/>
   </object-type>
-  <object-type name="QPlaceSearchResult"/>
+  <object-type name="QPlaceSearchResult">
+      <enum-type name="SearchResultType"/>
+  </object-type>
   <object-type name="QPlaceSearchSuggestionReply"/>
   <value-type name="QPlaceSupplier"/>
 </typesystem>
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
index 7ae19a2a7..7394b121f 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -600,7 +600,7 @@
             <replace-type modified-type="PyTuple" />
         </modify-argument>
         <inject-code class="target" position="beginning">
-            <insert-template name="fix_bool*,arg"/>
+            <insert-template name="bool*_fix,arg"/>
         </inject-code>
     </modify-function>
     <modify-function signature="getFont(bool*,QFont,QWidget*,QString,QFlags&lt;QFontDialog::FontDialogOption&gt;)">
@@ -611,7 +611,7 @@
             <replace-type modified-type="PyTuple" />
         </modify-argument>
         <inject-code class="target" position="beginning">
-            <insert-template name="fix_bool*,arg,arg,arg,arg"/>
+            <insert-template name="bool*_fix,arg,arg,arg,arg"/>
         </inject-code>
     </modify-function>
   </object-type>
diff --git a/sources/pyside2/PySide2/typesystem_templates.xml b/sources/pyside2/PySide2/typesystem_templates.xml
index b13ab4b63..a17337258 100644
--- a/sources/pyside2/PySide2/typesystem_templates.xml
+++ b/sources/pyside2/PySide2/typesystem_templates.xml
@@ -50,6 +50,25 @@
         Shiboken::Object::setParent(%PYSELF, $PYARG);
     </template>
 
+    <template name="tuple_ok_retval">
+    %PYARG_0 = PyTuple_New(2);
+    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[bool](ok_));
+    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
+    </template>
+    <template name="bool*_fix,arg">
+        bool ok_;
+        %BEGIN_ALLOW_THREADS
+        %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_ok_retval"/>
+    </template>
+    <template name="bool*_fix,arg,arg,arg,arg">
+        bool ok_;
+        %BEGIN_ALLOW_THREADS
+        %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3, %4, %5);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_ok_retval"/>
+    </template>
     <!-- Templates to fix bool* parameters -->
     <template name="tuple_retval_ok">
     %PYARG_0 = PyTuple_New(2);
diff --git a/sources/shiboken2/libshiboken/CMakeLists.txt b/sources/shiboken2/libshiboken/CMakeLists.txt
index b5ba78e15..dd304bdca 100644
--- a/sources/shiboken2/libshiboken/CMakeLists.txt
+++ b/sources/shiboken2/libshiboken/CMakeLists.txt
@@ -51,7 +51,7 @@ qapp_macro.cpp
 pep384impl.cpp
 voidptr.cpp
 typespec.cpp
-bufferprocs27.cpp
+bufferprocs_py37.cpp
 )
 
 get_numpy_location()
@@ -97,7 +97,7 @@ install(FILES
         qapp_macro.h
         voidptr.h
         typespec.h
-        bufferprocs27.h
+        bufferprocs_py37.h
         "${CMAKE_CURRENT_BINARY_DIR}/sbkversion.h"
         DESTINATION include/shiboken2${shiboken2_SUFFIX})
 install(TARGETS libshiboken EXPORT shiboken2
diff --git a/sources/shiboken2/libshiboken/bufferprocs27.cpp b/sources/shiboken2/libshiboken/bufferprocs_py37.cpp
index 84d670d21..84d670d21 100644
--- a/sources/shiboken2/libshiboken/bufferprocs27.cpp
+++ b/sources/shiboken2/libshiboken/bufferprocs_py37.cpp
diff --git a/sources/shiboken2/libshiboken/bufferprocs27.h b/sources/shiboken2/libshiboken/bufferprocs_py37.h
index 6fc7a3ece..6fc7a3ece 100644
--- a/sources/shiboken2/libshiboken/bufferprocs27.h
+++ b/sources/shiboken2/libshiboken/bufferprocs_py37.h
diff --git a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken2/libshiboken/pep384impl.cpp
index b648330d8..e1dd7518f 100644
--- a/sources/shiboken2/libshiboken/pep384impl.cpp
+++ b/sources/shiboken2/libshiboken/pep384impl.cpp
@@ -341,7 +341,7 @@ extern "C"
  */
 
 /*
- * Here is the verification code for PepTypeObject.
+ * Here is the verification code for PyTypeObject.
  * We create a type object and check if its fields
  * appear at the right offsets.
  */
@@ -402,7 +402,7 @@ static PyType_Spec typeprobe_spec = {
 };
 
 static void
-check_PepTypeObject_valid(void)
+check_PyTypeObject_valid(void)
 {
     PyObject *obtype = reinterpret_cast<PyObject *>(&PyType_Type);
     PyTypeObject *probe_tp_base = reinterpret_cast<PyTypeObject *>(
@@ -827,7 +827,7 @@ PepType_GetNameStr(PyTypeObject *type)
 void
 Pep384_Init()
 {
-    check_PepTypeObject_valid();
+    check_PyTypeObject_valid();
 #ifdef Py_LIMITED_API
     Pep_GetVerboseFlag();
     PepMethod_TypePtr = getMethodType();
diff --git a/sources/shiboken2/libshiboken/pep384impl.h b/sources/shiboken2/libshiboken/pep384impl.h
index 643714f04..d06947f06 100644
--- a/sources/shiboken2/libshiboken/pep384impl.h
+++ b/sources/shiboken2/libshiboken/pep384impl.h
@@ -53,7 +53,7 @@ extern "C"
 
 // Extracted into bufferprocs27.h
 #ifdef Py_LIMITED_API
-#include "bufferprocs27.h"
+#include "bufferprocs_py37.h"
 #endif
 
 /*****************************************************************************
@@ -136,11 +136,6 @@ typedef struct _typeobject {
 LIBSHIBOKEN_API int PyIndex_Check(PyObject *obj);
 #endif
 
-#undef PyObject_IS_GC
-#define PyObject_IS_GC(o) (PyType_IS_GC(Py_TYPE(o)) && \
-    ( Py_TYPE(o)->tp_is_gc == NULL || \
-      Py_TYPE(o)->tp_is_gc(o) ))
-
 #endif // Py_LIMITED_API
 
 struct SbkObjectTypePrivate;
@@ -148,22 +143,22 @@ struct PySideQFlagsTypePrivate;
 struct _SbkGenericTypePrivate;
 
 #define PepHeapType_SIZE \
-    (reinterpret_cast<PyTypeObject*>(&PyType_Type)->tp_basicsize)
+    (reinterpret_cast<PyTypeObject *>(&PyType_Type)->tp_basicsize)
 
 #define _genericTypeExtender(etype) \
-    (reinterpret_cast<char*>(etype) + PepHeapType_SIZE)
+    (reinterpret_cast<char *>(etype) + PepHeapType_SIZE)
 
 #define PepType_SOTP(etype) \
-    (*reinterpret_cast<SbkObjectTypePrivate**>(_genericTypeExtender(etype)))
+    (*reinterpret_cast<SbkObjectTypePrivate **>(_genericTypeExtender(etype)))
 
 #define PepType_SETP(etype) \
-    (reinterpret_cast<SbkEnumTypePrivate*>(_genericTypeExtender(etype)))
+    (reinterpret_cast<SbkEnumTypePrivate *>(_genericTypeExtender(etype)))
 
 #define PepType_PFTP(etype) \
-    (reinterpret_cast<PySideQFlagsTypePrivate*>(_genericTypeExtender(etype)))
+    (reinterpret_cast<PySideQFlagsTypePrivate *>(_genericTypeExtender(etype)))
 
 #define PepType_SGTP(etype) \
-    (reinterpret_cast<_SbkGenericTypePrivate*>(_genericTypeExtender(etype)))
+    (reinterpret_cast<_SbkGenericTypePrivate *>(_genericTypeExtender(etype)))
 
 // functions used everywhere
 LIBSHIBOKEN_API const char *PepType_GetNameStr(PyTypeObject *type);
@@ -237,8 +232,8 @@ LIBSHIBOKEN_API char *_PepUnicode_AsString(PyObject *);
  */
 #ifdef Py_LIMITED_API
 #define PyTuple_GET_ITEM(op, i)     PyTuple_GetItem((PyObject *)op, i)
-#define PyTuple_GET_SIZE(op)        PyTuple_Size((PyObject *)op)
 #define PyTuple_SET_ITEM(op, i, v)  PyTuple_SetItem(op, i, v)
+#define PyTuple_GET_SIZE(op)        PyTuple_Size((PyObject *)op)
 #endif
 
 /*****************************************************************************
@@ -272,15 +267,6 @@ typedef struct _pycfunc PyCFunctionObject;
 
 /*****************************************************************************
  *
- * RESOLVED: descrobject.h
- *
- */
-#ifdef Py_LIMITED_API
-typedef struct _methoddescr PyMethodDescrObject;
-#endif
-
-/*****************************************************************************
- *
  * RESOLVED: pythonrun.h
  *
  */
@@ -380,7 +366,8 @@ LIBSHIBOKEN_API PyObject *PyMethod_Self(PyObject *);
  */
 #ifdef Py_LIMITED_API
 /* Bytecode object */
-    // we have to grab the code object from python
+
+// we have to grab the code object from python
 typedef struct _code PyCodeObject;
 
 LIBSHIBOKEN_API int PepCode_Get(PyCodeObject *co, const char *name);
diff --git a/sources/shiboken2/libshiboken/qt_attribution.json b/sources/shiboken2/libshiboken/qt_attribution.json
index 14695a4d2..12a0952df 100644
--- a/sources/shiboken2/libshiboken/qt_attribution.json
+++ b/sources/shiboken2/libshiboken/qt_attribution.json
@@ -3,7 +3,7 @@
     "Name": "Python",
     "QDocModule": "QtForPython",
     "QtUsage": "Used for Qt for Python in the signature extension.",
-    "Description": "Qt for Python is an add-on for Python. The libshiboken packages of PySide uses certain parts of the source files (typespec.cpp, typespec.h, bufferprocs27.cpp, bufferprocs27.h). See the folder sources/shiboken2/libshiboken .",
+    "Description": "Qt for Python is an add-on for Python. The libshiboken packages of PySide uses certain parts of the source files (typespec.cpp, typespec.h, bufferprocs_py37.cpp, bufferprocs_py37.h). See the folder sources/shiboken2/libshiboken .",
     "Homepage": "http://www.python.org/",
     "Version": "3.7.0",
     "License": "PSF LICENSE AGREEMENT FOR PYTHON 3.7.0",