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

Change-Id: I302543eef74bc1f3dc6340cdfab7510a66ea1b6a

5 files changed, 39 insertions, 17 deletions

diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
index 7394b121f..9da5c71d9 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -405,6 +405,11 @@
     <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)">
       <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
+    <modify-function signature="setGraphicsEffect(QGraphicsEffect*)">
+      <modify-argument index="1">
+        <parent index="this" action="add"/>
+      </modify-argument>
+    </modify-function>
     <!-- ### These methods are internal on Qt. -->
     <modify-function signature="supportsExtension(QGraphicsItem::Extension)const" remove="all"/>
     <modify-function signature="setExtension(QGraphicsItem::Extension,QVariant)" remove="all"/>
diff --git a/sources/pyside2/PySide2/support/signature/backport_inspect.py b/sources/pyside2/PySide2/support/signature/backport_inspect.py
index 9fed3e82e..0eafe9caa 100644
--- a/sources/pyside2/PySide2/support/signature/backport_inspect.py
+++ b/sources/pyside2/PySide2/support/signature/backport_inspect.py
@@ -88,6 +88,10 @@ PSF LICENSE AGREEMENT FOR PYTHON 3.7.0
    to be bound by the terms and conditions of this License Agreement.
 """
 
+__doc__ = """
+    signature() - get a Signature object for the callable
+"""
+
 import sys
 from collections import OrderedDict
 
diff --git a/sources/pyside2/PySide2/support/signature/loader.py b/sources/pyside2/PySide2/support/signature/loader.py
index 1827ca454..f51bafe79 100644
--- a/sources/pyside2/PySide2/support/signature/loader.py
+++ b/sources/pyside2/PySide2/support/signature/loader.py
@@ -40,13 +40,18 @@
 from __future__ import print_function, absolute_import
 
 """
+loader.py
+
+The loader has to lazy-load the signature module and also provides a few
+Python modules to support Python 2.7 .
+
 This file was originally directly embedded into the C source.
 After it grew more and more, I now prefer to have it as Python file.
-The remaining stub loader is a short string now.
+The remaining stub loader in the C source is now only a short string.
 
-The loader has to lazy-load the signature module and also provides a few
-Python modules that I consider essential and therefore built-in.
-This version does not use an embedded .zip file.
+This version does no longer use an embedded .zip file but is a package.
+The old code without a package but with zip compression can still be found
+at https://codereview.qt-project.org/#/c/203533/ for reference.
 """
 
 import sys
@@ -64,7 +69,12 @@ else:
     import inspect
     namespace = inspect.__dict__
     from PySide2.support.signature import backport_inspect as inspect
+    _doc = inspect.__doc__
     inspect.__dict__.update(namespace)
+    inspect.__doc__ += _doc
+    # force inspect to find all attributes. See "heuristic" in pydoc.py!
+    inspect.__all__ = list(x for x in dir(inspect) if not x.startswith("_"))
+
 # name used in signature.cpp
 from PySide2.support.signature.parser import pyside_type_init
 sys.path.pop(0)
diff --git a/sources/pyside2/PySide2/support/signature/mapping.py b/sources/pyside2/PySide2/support/signature/mapping.py
index 7151af8bb..dd3df0988 100644
--- a/sources/pyside2/PySide2/support/signature/mapping.py
+++ b/sources/pyside2/PySide2/support/signature/mapping.py
@@ -40,7 +40,7 @@
 from __future__ import print_function, absolute_import
 
 """
-signature_mapping.py
+mapping.py
 
 This module has the mapping from the pyside C-modules view of signatures
 to the Python representation.
diff --git a/sources/pyside2/PySide2/support/signature/parser.py b/sources/pyside2/PySide2/support/signature/parser.py
index eb6453d3e..9313fb540 100644
--- a/sources/pyside2/PySide2/support/signature/parser.py
+++ b/sources/pyside2/PySide2/support/signature/parser.py
@@ -49,21 +49,24 @@ from .mapping import type_map, update_mapping, __dict__ as namespace
 
 _DEBUG = False
 
-TYPE_MAP_DOC = """
-    The type_map variable is central for the signature package.
+"""
+parser.py
+
+This module parses the signature text and creates properties for the
+signature objects.
 
-    PySide has a new function 'CppGenerator::writeSignatureInfo()'
-    that extracts the gathered information about the function arguments
-    and defaults as good as it can. But what PySide generates is still
-    very C-ish and has many constants that Python doesn't understand.
+PySide has a new function 'CppGenerator::writeSignatureInfo()'
+that extracts the gathered information about the function arguments
+and defaults as good as it can. But what PySide generates is still
+very C-ish and has many constants that Python doesn't understand.
 
-    The function 'try_to_guess()' below understands a lot of PySide's
-    peculiar way to assume local context. If it is able to do the guess,
-    then the result is inserted into the dict, so the search happens
-    not again. For everything that is not covered by these automatic
-    guesses, we provide an entry in 'type_map' that resolves it.
+The function 'try_to_guess()' below understands a lot of PySide's
+peculiar way to assume local context. If it is able to do the guess,
+then the result is inserted into the dict, so the search happens
+not again. For everything that is not covered by these automatic
+guesses, we provide an entry in 'type_map' that resolves it.
 
-    In effect, 'type_map' maps text to real Python objects.
+In effect, 'type_map' maps text to real Python objects.
 """
 
 def dprint(*args, **kw):