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

Qt For Python Release 5.15.12

Change-Id: I6bb1407a6766d4a7dd639873feef65966bd6a1e0

9 files changed, 47 insertions, 18 deletions

diff --git a/build_scripts/config.py b/build_scripts/config.py
index 9bb4c6495..f2b4c40b1 100644
--- a/build_scripts/config.py
+++ b/build_scripts/config.py
@@ -137,7 +137,7 @@ class Config(object):
         setup_kwargs['zip_safe'] = False
         setup_kwargs['cmdclass'] = cmd_class_dict
         setup_kwargs['version'] = package_version
-        setup_kwargs['python_requires'] = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <3.11"
+        setup_kwargs['python_requires'] = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <3.12"
 
         if quiet:
             # Tells distutils / setuptools to be quiet, and only print warnings or errors.
diff --git a/build_scripts/main.py b/build_scripts/main.py
index c7e67ac12..f74845503 100644
--- a/build_scripts/main.py
+++ b/build_scripts/main.py
@@ -1244,7 +1244,7 @@ class PysideRstDocs(Command, DistUtilsCommandMixin):
             elif self.name == "shiboken2":
                 self.sphinx_src = self.out_dir
 
-            sphinx_cmd = ["sphinx-build", "-b", "html", "-c", self.sphinx_src,
+            sphinx_cmd = ["sphinx-build", "-b", "html", "-j", "auto", "-c", self.sphinx_src,
                           self.doc_dir, self.out_dir]
             if run_process(sphinx_cmd) != 0:
                 raise DistutilsSetupError("Error running CMake for {}".format(self.doc_dir))
diff --git a/coin/dependencies.yaml b/coin/dependencies.yaml
index 93d33c901..7e0fa64e0 100644
--- a/coin/dependencies.yaml
+++ b/coin/dependencies.yaml
@@ -1,6 +1,6 @@
 product_dependency:
   ../../qt/tqtc-qt5.git:
-    ref: "5bbe0d09c5ec49df334b62ed1b3338bbba5d1981"
+    ref: "6f699275d508af0c5d61c91914ca1e45fec6b7ef"
 dependency_source: supermodule
 dependencies: [
       "../../qt/qt3d",
diff --git a/dist/changes-5.15.11 b/dist/changes-5.15.11
index 172df845f..95a0d4521 100644
--- a/dist/changes-5.15.11
+++ b/dist/changes-5.15.11
@@ -24,3 +24,12 @@ information about a particular change.
  - [PYSIDE-2019] Crashes when using QtDataVisualization's
                  QValue3DAxisFormatter have been fixed.
  - [PYSIDE-2043] Errors when using VSCode's Intellisense have been fixed.
+ - [PYSIDE-2034] Blocking threads in static functions of QMessageBox
+                 have been fixed.
+
+****************************************************************************
+*                                  Shiboken2                               *
+****************************************************************************
+
+ - [PYSIDE-1960] Crashes in libshiboken related to Python 3.11
+                 have been fixed.
diff --git a/dist/changes-5.15.12 b/dist/changes-5.15.12
new file mode 100644
index 000000000..ce0fde9b1
--- /dev/null
+++ b/dist/changes-5.15.12
@@ -0,0 +1,24 @@
+Qt for Python 5.5.12 is a bug-fix release.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qtforpython/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                                  PySide2                                 *
+****************************************************************************
+
+****************************************************************************
+*                                  Shiboken2                               *
+****************************************************************************
+
+ - [PYSIDE-1012] Missing includes for g++ 11.3 have been added.
diff --git a/sources/pyside2/doc/modules.rst b/sources/pyside2/doc/modules.rst
index bb4b112a1..f9a5b2828 100644
--- a/sources/pyside2/doc/modules.rst
+++ b/sources/pyside2/doc/modules.rst
@@ -1,5 +1,5 @@
-Qt Modules
-===========
+Qt Modules Supported by Qt for Python
+=====================================
 
 .. toctree::
    :hidden:
diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py
index 88792a380..290c1dc12 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 = "11"
+patch_version = "12"
 
 # For example: "a", "b", "rc"
 # (which means "alpha", "beta", "release candidate").
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
index 0b58cf5a5..02b4614a4 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
@@ -345,17 +345,13 @@ QByteArrayList emulatedCompilerOptions()
     appendClangBuiltinIncludes(&headerPaths);
 #  endif // NEED_CLANG_BUILTIN_INCLUDES
 
-    // Append the c++ include paths since Clang is unable to find <list> etc
-    // on RHEL 7 with g++ 6.3 or CentOS 7.2.
-    // A fix for this has been added to Clang 5.0, so, the code can be removed
-    // once Clang 5.0 is the minimum version.
-    if (needsGppInternalHeaders()) {
-        const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("g++")));
-        for (const HeaderPath &h : gppPaths) {
-            if (h.path.contains("c++")
-                || h.path.contains("sysroot")) { // centOS
-                headerPaths.append(h);
-            }
+    // Append the c++ include paths since Clang is unable to find
+    // <type_traits> etc (g++ 11.3).
+    const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("g++")));
+    for (const HeaderPath &h : gppPaths) {
+        if (h.path.contains("c++")
+            || h.path.contains("sysroot")) { // centOS
+            headerPaths.append(h);
         }
     }
 #else
diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken2/shiboken_version.py
index 88792a380..290c1dc12 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 = "11"
+patch_version = "12"
 
 # For example: "a", "b", "rc"
 # (which means "alpha", "beta", "release candidate").