Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I137dc1d4b7dc73ee8ad4cff2eb031e2aaead2644

4 files changed, 47 insertions, 19 deletions

diff --git a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
index 2cbe490aa..c3b800454 100644
--- a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
+++ b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
@@ -62,7 +62,7 @@
          of the `.ui` file.
 
          (Remember that `duck punching virtual methods is an invitation for your own demise!
-         <http://www.pyside.org/docs/shiboken/wordsofadvice.html#duck-punching-and-virtual-methods>`_)
+         <https://doc.qt.io/qtforpython/shiboken2/wordsofadvice.html#duck-punching-and-virtual-methods>`_)
 
          Let's see an obvious example. If you want to create a new widget it's probable you'll end up
          overriding :class:`~PySide2.QtGui.QWidget`'s :meth:`~PySide2.QtGui.QWidget.paintEvent` method.
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
index c2c36d60f..a41a27c33 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -610,7 +610,13 @@
       <include file-name="QPair" location="global"/>
     </extra-includes>
   </object-type>
-  <object-type name="QGraphicsItemGroup"/>
+  <object-type name="QGraphicsItemGroup">
+    <modify-function signature="addToGroup(QGraphicsItem*)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
+  </object-type>
   <object-type name="QGraphicsLineItem"/>
   <object-type name="QGraphicsPathItem"/>
   <object-type name="QGraphicsPixmapItem">
diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp
index 629484458..6259724c3 100644
--- a/sources/pyside2/PySide2/glue/qtcore.cpp
+++ b/sources/pyside2/PySide2/glue/qtcore.cpp
@@ -965,13 +965,33 @@ if (PyIndex_Check(_key)) {
 // @snippet qbytearray-msetitem
 
 // @snippet qbytearray-bufferprotocol
-#if PY_VERSION_HEX < 0x03000000
-
+extern "C" {
 // QByteArray buffer protocol functions
 // see: http://www.python.org/dev/peps/pep-3118/
 
-extern "C" {
+static int SbkQByteArray_getbufferproc(PyObject* obj, Py_buffer *view, int flags)
+{
+    if (!view || !Shiboken::Object::isValid(obj))
+        return -1;
+
+    QByteArray* cppSelf = %CONVERTTOCPP[QByteArray*](obj);
+    view->obj = obj;
+    view->buf = reinterpret_cast<void*>(cppSelf->data());
+    view->len = cppSelf->size();
+    view->readonly = 0;
+    view->itemsize = 1;
+    view->format = const_cast<char*>("c");
+    view->ndim = 1;
+    view->shape = NULL;
+    view->strides = &view->itemsize;
+    view->suboffsets = NULL;
+    view->internal = NULL;
+
+    Py_XINCREF(obj);
+    return 0;
+}
 
+#if PY_VERSION_HEX < 0x03000000
 static Py_ssize_t SbkQByteArray_segcountproc(PyObject* self, Py_ssize_t* lenp)
 {
     if (lenp)
@@ -993,12 +1013,18 @@ PyBufferProcs SbkQByteArrayBufferProc = {
     /*bf_getreadbuffer*/  &SbkQByteArray_readbufferproc,
     /*bf_getwritebuffer*/ (writebufferproc) &SbkQByteArray_readbufferproc,
     /*bf_getsegcount*/    &SbkQByteArray_segcountproc,
-    /*bf_getcharbuffer*/  (charbufferproc) &SbkQByteArray_readbufferproc
+    /*bf_getcharbuffer*/  (charbufferproc) &SbkQByteArray_readbufferproc,
+    /*bf_getbuffer*/  (getbufferproc)SbkQByteArray_getbufferproc,
 };
+#else
 
-}
+static PyBufferProcs SbkQByteArrayBufferProc = {
+    /*bf_getbuffer*/  (getbufferproc)SbkQByteArray_getbufferproc,
+    /*bf_releasebuffer*/ (releasebufferproc)0,
+};
 
 #endif
+}
 // @snippet qbytearray-bufferprotocol
 
 // @snippet qbytearray-operatorplus-1
@@ -1110,8 +1136,14 @@ if (PyBytes_Check(%PYARG_1)) {
 
 // @snippet qbytearray-py3
 #if PY_VERSION_HEX < 0x03000000
-    Shiboken::SbkType<QByteArray>()->tp_as_buffer = &SbkQByteArrayBufferProc;
-    Shiboken::SbkType<QByteArray>()->tp_flags |= Py_TPFLAGS_HAVE_GETCHARBUFFER;
+Shiboken::SbkType<QByteArray>()->tp_as_buffer = &SbkQByteArrayBufferProc;
+Shiboken::SbkType<QByteArray>()->tp_flags |= Py_TPFLAGS_HAVE_NEWBUFFER;
+#else
+#ifdef Py_LIMITED_API
+PepType_AS_BUFFER(Shiboken::SbkType<QByteArray>()) = &SbkQByteArrayBufferProc;
+#else
+Shiboken::SbkType<QByteArray>()->tp_as_buffer = &SbkQByteArrayBufferProc;
+#endif
 #endif
 // @snippet qbytearray-py3
 
diff --git a/sources/pyside2/PySide2/support/generate_pyi.py b/sources/pyside2/PySide2/support/generate_pyi.py
index 21ef841fe..a92ee76f0 100644
--- a/sources/pyside2/PySide2/support/generate_pyi.py
+++ b/sources/pyside2/PySide2/support/generate_pyi.py
@@ -53,13 +53,6 @@ import re
 import subprocess
 import argparse
 import glob
-# PYSIDE-953: Use a newer contextlib for Python 3.5
-skip_creation = False
-if sys.version_info[:2] == (3, 5):
-    try:
-        import PySide2.support.signature  # gets new contextlib
-    except:
-        skip_creation = True
 from contextlib import contextmanager
 from textwrap import dedent
 
@@ -279,9 +272,6 @@ def single_process(lockdir):
 
 
 def generate_all_pyi(outpath, options):
-    if skip_creation:
-        logger.warn("Sorry, we cannot create .pyi files with Python 3.5 while PySide")
-        logger.warn(" is not installed. Please run it by hand!")
     ps = os.pathsep
     if options.sys_path:
         # make sure to propagate the paths from sys_path to subprocesses