Merge tag 'v5.15.9-lts' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl

Qt For Python Release 5.15.9

Change-Id: I6a2717036c50f27aa0eeea6cfcfbc2970c0bd04a

7 files changed, 29 insertions, 31 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index d7ae45ae3..5a413ecaa 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -1918,7 +1918,7 @@ AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(const Functio
     for (const FunctionModification &mod : functionMods) {
         if (mod.exceptionHandling() != TypeSystem::ExceptionHandling::Unspecified)
             metaFunction->setExceptionHandlingModification(mod.exceptionHandling());
-        else if (mod.allowThread() != TypeSystem::AllowThread::Unspecified)
+        if (mod.allowThread() != TypeSystem::AllowThread::Unspecified)
             metaFunction->setAllowThreadModification(mod.allowThread());
     }
 
diff --git a/sources/shiboken2/ApiExtractor/typesystem_enums.h b/sources/shiboken2/ApiExtractor/typesystem_enums.h
index 0d7f279c4..3199c32ef 100644
--- a/sources/shiboken2/ApiExtractor/typesystem_enums.h
+++ b/sources/shiboken2/ApiExtractor/typesystem_enums.h
@@ -44,10 +44,10 @@ enum Language {
 };
 
 enum class AllowThread {
+    Unspecified,
     Allow,
     Disallow,
-    Auto,
-    Unspecified
+    Auto
 };
 
 enum Ownership {
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index b42ee2927..1ebe38fbc 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -3308,11 +3308,6 @@ void CppGenerator::writeNamedArgumentResolution(QTextStream &s, const AbstractMe
             else
                 s << INDENT << "// fall through to handle extra keyword signals and properties\n";
         }
-        s << INDENT << "} else {\n";
-        {
-            Indentation indent(INDENT);
-            s << INDENT << "Py_DECREF(kwds_dup);\n";
-        }
         s << INDENT << "}\n";
     }
     s << INDENT << "}\n";
diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp
index 7ac7fada2..afca7fa08 100644
--- a/sources/shiboken2/libshiboken/basewrapper.cpp
+++ b/sources/shiboken2/libshiboken/basewrapper.cpp
@@ -804,6 +804,7 @@ static PyObject *_setupNew(SbkObject *self, PyTypeObject *subtype)
     d->parentInfo = nullptr;
     d->referredObjects = nullptr;
     d->cppObjectCreated = 0;
+    d->isQAppSingleton = 0;
     self->ob_dict = nullptr;
     self->weakreflist = nullptr;
     self->d = d;
diff --git a/sources/shiboken2/libshiboken/embed/signature_bootstrap.py b/sources/shiboken2/libshiboken/embed/signature_bootstrap.py
index 902864267..b64131c15 100644
--- a/sources/shiboken2/libshiboken/embed/signature_bootstrap.py
+++ b/sources/shiboken2/libshiboken/embed/signature_bootstrap.py
@@ -62,6 +62,11 @@ recursion_trap = 0
 # Python 2 is not able to import when the extension import is still active.
 # Phase 1 simply defines the functions, which will be used in Phase 2.
 
+import sys
+if sys.version_info[0] >= 3:
+    from importlib.machinery import ModuleSpec
+
+
 def bootstrap():
     import sys
     import os
@@ -204,31 +209,28 @@ class EmbeddableZipImporter(object):
             return None
 
         self.zfile = zip_file
-        self._path2mod = {_.filename : p2m(_.filename) for _ in zip_file.filelist}
-        self._mod2path = {_[1] : _[0] for _ in self._path2mod.items()}
+        self._mod2path = {p2m(_.filename) : _.filename for _ in zip_file.filelist}
 
-    def find_module(self, fullname, path):
-        return self if self._mod2path.get(fullname) else None
+    def find_spec(self, fullname, path, target=None):
+        path = self._mod2path.get(fullname)
+        return ModuleSpec(fullname, self) if path else None
 
-    def load_module(self, fullname):
-        import importlib
-        import sys
+    def create_module(self, spec):
+        return None
 
-        filename = self._mod2path.get(fullname)
-        if filename not in self._path2mod:
-            raise ImportError(fullname)
-        module_spec = importlib.machinery.ModuleSpec(fullname, None)
-        new_module = importlib.util.module_from_spec(module_spec)
+    def exec_module(self, module):
+        fullname = module.__spec__.name
+        filename = self._mod2path[fullname]
         with self.zfile.open(filename, "r") as f:   # "rb" not for zipfile
-            exec(f.read(), new_module.__dict__)
-        new_module.__file__ = filename
-        new_module.__loader__ = self
+            codeob = compile(f.read(), filename, "exec")
+            exec(codeob, module.__dict__)
+        module.__file__ = filename
+        module.__loader__ = self
         if filename.endswith("/__init__.py"):
-            new_module.__path__ = []
-            new_module.__package__ = fullname
+            module.__path__ = []
+            module.__package__ = fullname
         else:
-            new_module.__package__ = fullname.rpartition('.')[0]
-        sys.modules[fullname] = new_module
-        return new_module
+            module.__package__ = fullname.rpartition('.')[0]
+        sys.modules[fullname] = module
 
 # eof
diff --git a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken2/libshiboken/pep384impl.cpp
index 66df0fd94..fb28d883f 100644
--- a/sources/shiboken2/libshiboken/pep384impl.cpp
+++ b/sources/shiboken2/libshiboken/pep384impl.cpp
@@ -751,7 +751,7 @@ _Pep_PrivateMangle(PyObject *self, PyObject *name)
 #endif // IS_PY2
     Shiboken::AutoDecRef privateobj(PyObject_GetAttr(
         reinterpret_cast<PyObject *>(Py_TYPE(self)), Shiboken::PyMagicName::name()));
-#ifndef Py_LIMITED_API
+#ifdef IS_PY2
     return _Py_Mangle(privateobj, name);
 #else
     // PYSIDE-1436: _Py_Mangle is no longer exposed; implement it always.
@@ -789,7 +789,7 @@ _Pep_PrivateMangle(PyObject *self, PyObject *name)
     if (amount > big_stack)
         free(resbuf);
     return result;
-#endif // else Py_LIMITED_API
+#endif // else IS_PY2
 }
 
 /*****************************************************************************
diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken2/shiboken_version.py
index ba6e714b1..34caf4590 100644
--- a/sources/shiboken2/shiboken_version.py
+++ b/sources/shiboken2/shiboken_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").