6 files changed, 37 insertions, 12 deletions
diff --git a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
index 4f6d9086c..9e3b50cbc 100644
--- a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
+++ b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml
@@ -57,6 +57,11 @@
 
     <object-type name="QQuickFramebufferObject">
         <object-type name="Renderer"/>
+        <modify-function signature="createRenderer()const">
+            <modify-argument index="return">
+                <define-ownership class="native" owner="c++"/>
+            </modify-argument>
+        </modify-function>
     </object-type>
 
     <object-type name="QQuickTextureFactory"/>
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
index 91458e313..6a6845f58 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -548,6 +548,11 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
+    <modify-function signature="setPage(int,QWizardPage*)">
+      <modify-argument index="2">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
     <modify-function signature="setButton(QWizard::WizardButton,QAbstractButton*)">
       <modify-argument index="2">
         <parent index="this" action="add"/>
diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp
index 78de3d5d5..8a9aae8f7 100644
--- a/sources/pyside2/PySide2/glue/qtcore.cpp
+++ b/sources/pyside2/PySide2/glue/qtcore.cpp
@@ -1065,9 +1065,10 @@ if (PyIndex_Check(_key)) {
             if (PyLong_Check(item) || PyInt_Check(item)) {
 #endif
                 int overflow;
-                long ival = PyLong_AsLongAndOverflow(item, &overflow);
-                // Not suppose to bigger than 255 because only bytes, bytearray, QByteArray were accept
-                temp = QByteArray(reinterpret_cast<const char *>(&ival));
+                const long ival = PyLong_AsLongAndOverflow(item, &overflow);
+                // Not supposed to be bigger than 255 because only bytes,
+                // bytearray, QByteArray were accepted
+                temp.append(char(ival));
             } else {
                 temp = %CONVERTTOCPP[QByteArray](item);
             }
@@ -1751,7 +1752,25 @@ Py_END_ALLOW_THREADS
 // @snippet conversion-pylong-quintptr
 
 // @snippet conversion-pyunicode
-#ifndef Py_LIMITED_API
+#if defined(Py_LIMITED_API)
+    wchar_t *temp = PyUnicode_AsWideCharString(%in, NULL);
+    %out = QString::fromWCharArray(temp);
+    PyMem_Free(temp);
+#elif defined(IS_PY3K)
+    void *data = PyUnicode_DATA(%in);
+    Py_ssize_t len = PyUnicode_GetLength(%in);
+    switch (PyUnicode_KIND(%in)) {
+        case PyUnicode_1BYTE_KIND:
+            %out = QString::fromLatin1(reinterpret_cast<const char *>(data));
+            break;
+        case PyUnicode_2BYTE_KIND:
+            %out = QString::fromUtf16(reinterpret_cast<const char16_t *>(data), len);
+            break;
+        case PyUnicode_4BYTE_KIND:
+            %out = QString::fromUcs4(reinterpret_cast<const char32_t *>(data), len);
+            break;
+    }
+#else // IS_PY3K
 Py_UNICODE *unicode = PyUnicode_AS_UNICODE(%in);
 #  if defined(Py_UNICODE_WIDE)
 // cast as Py_UNICODE can be a different type
@@ -1767,11 +1786,7 @@ Py_UNICODE *unicode = PyUnicode_AS_UNICODE(%in);
 %out = QString::fromUtf16(reinterpret_cast<const ushort *>(unicode), PepUnicode_GetLength(%in));
 #    endif // Qt 6
 # endif
-#else
-wchar_t *temp = PyUnicode_AsWideCharString(%in, NULL);
-%out = QString::fromWCharArray(temp);
-PyMem_Free(temp);
-#endif
+#endif // !IS_PY3K
 // @snippet conversion-pyunicode
 
 // @snippet conversion-pystring
diff --git a/sources/pyside2/PySide2/licensecomment.txt b/sources/pyside2/PySide2/licensecomment.txt
index 9d271ba2a..05d291030 100644
--- a/sources/pyside2/PySide2/licensecomment.txt
+++ b/sources/pyside2/PySide2/licensecomment.txt
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt for Python.
diff --git a/sources/pyside2/libpyside/pysideproperty.cpp b/sources/pyside2/libpyside/pysideproperty.cpp
index 33b7c9c2e..73d6767dd 100644
--- a/sources/pyside2/libpyside/pysideproperty.cpp
+++ b/sources/pyside2/libpyside/pysideproperty.cpp
@@ -373,7 +373,7 @@ static PyObject *qPropertyDocGet(PyObject *self, void *)
     if (pData->fget != nullptr) {
         // PYSIDE-1019: Fetch the default `__doc__` from fget. We do it late.
         AutoDecRef get_doc(PyObject_GetAttr(pData->fget, PyMagicName::doc()));
-        if (!get_doc.isNull()) {
+        if (!get_doc.isNull() && get_doc.object() != Py_None) {
             pData->doc = String::toCString(get_doc);
             pData->getter_doc = true;
             if (Py_TYPE(self) == PySidePropertyTypeF())
diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py
index ba6e714b1..34caf4590 100644
--- a/sources/pyside2/pyside_version.py
+++ b/sources/pyside2/pyside_version.py
@@ -39,7 +39,7 @@
 
 major_version = "5"
 minor_version = "15"
-patch_version = "8"
+patch_version = "9"
 
 # For example: "a", "b", "rc"
 # (which means "alpha", "beta", "release candidate").