From 1adb18fc3166ee4bd15bf4921b1f11ae44f62d03 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 18 May 2021 15:56:17 +0200
Subject: PySide6/QtGui: Fix crashes in functions returning internally owned
 classes by pointer

Indicate Default ownership, for QClipboard.mimeData(),
QTextCursor.currentList(), QTextCursor.currentTable(), fixing:

RuntimeError: Internal C++ object (PySide6.QtCore.QMimeData) already deleted.
RuntimeError: Internal C++ object (PySide6.QtGui.QTextList) already deleted.

[ChangeLog][PySide6] Crashes in QClipboard.mimeData(),
QTextCursor.currentList() and QTextCursor.currentTable()
have been fixed.

Change-Id: I1e4f55856bce8bf951edd8579331f0242e904ae6
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 8cd50636102be2e1178c8c602a3e374891398e3e)
---
 sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index b0c61fe64..54f18e133 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -643,6 +643,16 @@
         <define-ownership class="target" owner="default"/>
       </modify-argument>
     </modify-function>
+    <modify-function signature="currentTable()const">
+      <modify-argument index="return">
+        <define-ownership class="target" owner="default"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="currentList()const">
+      <modify-argument index="return">
+        <define-ownership class="target" owner="default"/>
+      </modify-argument>
+    </modify-function>
     <modify-function signature="insertTable(int,int,const QTextTableFormat &amp;)">
       <modify-argument index="return">
         <define-ownership class="target" owner="default"/>
@@ -1760,6 +1770,11 @@
       </modify-argument>
       <inject-code class="target" position="end" file="../glue/qtgui.cpp" snippet="qclipboard-text"/>
     </modify-function>
+    <modify-function signature="mimeData(QClipboard::Mode)const">
+      <modify-argument index="return">
+        <define-ownership class="target" owner="default"/>
+      </modify-argument>
+    </modify-function>
   </object-type>
   <object-type name="QPaintEngineState">
     <extra-includes>
-- 
cgit v1.2.3


From 0eb2cde3fee7e3cdc2e1273001ae532c499680e5 Mon Sep 17 00:00:00 2001
From: Christian Tismer <tismer@stackless.com>
Date: Sat, 1 May 2021 14:47:05 +0200
Subject: __feature__: Ensure that features are not affected by other imports

Imports should not touch the feature dict unless they are feature imports.
This was a small error in the import logic.
(also fixed a const_cast glitch)

Change-Id: I16045fffb4b770861ff2efba674667894e0798e5
Fixes: PYSIDE-1548
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 39ba36db0fb8a3c722cb23e02f38abab9c67592c)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/pyside2/tests/QtCore/snake_prop_feature_test.py       |  2 ++
 sources/shiboken2/libshiboken/signature/signature.cpp         |  2 +-
 .../shibokenmodule/files.dir/shibokensupport/feature.py       | 11 ++++-------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sources/pyside2/tests/QtCore/snake_prop_feature_test.py b/sources/pyside2/tests/QtCore/snake_prop_feature_test.py
index 779b8a408..aea6a22ab 100644
--- a/sources/pyside2/tests/QtCore/snake_prop_feature_test.py
+++ b/sources/pyside2/tests/QtCore/snake_prop_feature_test.py
@@ -88,6 +88,8 @@ class FeatureTest(unittest.TestCase):
             window.modal
 
         from __feature__ import snake_case, true_property
+        #PYSIDE-1548: Make sure that another import does not clear the features.
+        import sys
 
         self.assertTrue(isinstance(QtWidgets.QWidget.modal, property))
         self.assertTrue(isinstance(window.modal, bool))
diff --git a/sources/shiboken2/libshiboken/signature/signature.cpp b/sources/shiboken2/libshiboken/signature/signature.cpp
index 8cda6f810..6880ea1f2 100644
--- a/sources/shiboken2/libshiboken/signature/signature.cpp
+++ b/sources/shiboken2/libshiboken/signature/signature.cpp
@@ -436,7 +436,7 @@ static PyObject *adjustFuncName(const char *func_name)
      * Note that fget is impossible because there are no parameters.
      */
     static const char mapping_name[] = "shibokensupport.signature.mapping";
-    static PyObject *sys_modules = PySys_GetObject("modules");
+    static PyObject *sys_modules = PySys_GetObject(const_cast<char *>("modules"));
     static PyObject *mapping = PyDict_GetItemString(sys_modules, mapping_name);
     static PyObject *ns = PyModule_GetDict(mapping);
 
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/feature.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/feature.py
index fe3491f9e..8bd8856ff 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/feature.py
+++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/feature.py
@@ -114,13 +114,10 @@ def _import(name, *args, **kwargs):
         sys.modules["PySide2.QtCore"].__init_feature__()
         return sys.modules["__feature__"]
 
-    if name.split(".")[0] == "PySide2":
-        # This is a module that imports PySide2.
-        flag = existing if isinstance(existing, int) else 0
-    else:
-        # This is some other module. Ignore it in switching.
-        flag = -1
-    pyside_feature_dict[importing_module] = flag
+    if importing_module not in pyside_feature_dict:
+        # Ignore new modules if not from PySide.
+        default = 0 if name.split(".")[0] == "PySide2" else -1
+        pyside_feature_dict[importing_module] = default
     return original_import(name, *args, **kwargs)
 
 _is_initialized = False
-- 
cgit v1.2.3


From 2b885c0fa6148b96ec88c0f6720bdffd5b4f2ef5 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 25 May 2021 10:34:31 +0200
Subject: Revert "Fix crashes when using the QImage(uchar *) data constructors"

It breaks a use case in pyqtgraph, which expects to be able
to manipulate the image by modifying the data.

This reverts commit cc011c8980cc4ce02e3d9cceb74ee028c204214e.

The helper Shiboken::Buffer::copyData() is left in place since
it can be useful for other cases.

Task-number: PYSIDE-1563
Change-Id: Ib0d58662a4257a315865436a32e99d9ee6369e03
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 4daaa2edd881865172f19c007c69113bf4afc8cd)
---
 sources/pyside2/PySide2/templates/gui_common.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sources/pyside2/PySide2/templates/gui_common.xml b/sources/pyside2/PySide2/templates/gui_common.xml
index 16116877f..a139a5fe9 100644
--- a/sources/pyside2/PySide2/templates/gui_common.xml
+++ b/sources/pyside2/PySide2/templates/gui_common.xml
@@ -80,8 +80,8 @@
     </template>
 
     <template name="qimage_buffer_constructor">
-        auto *ptr = reinterpret_cast&lt;uchar *&gt;(Shiboken::Buffer::copyData(%PYARG_1));
-        %0 = new %TYPE(ptr, %ARGS, std::free);
+        auto ptr = reinterpret_cast&lt;uchar*&gt;(Shiboken::Buffer::getPointer(%PYARG_1));
+        %0 = new %TYPE(ptr, %ARGS);
     </template>
 
     <template name="qcolor_repr">
-- 
cgit v1.2.3


From a97698f0a5d011fd206db94cf73dba6353f39b29 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 25 May 2021 11:24:21 +0200
Subject: Fix crashes when using the QImage(uchar *) data constructors, take 2

The constructors expect a range of memory that remains valid
through the lifetime of the image and may also modify it.
Crashes occurred since apparently the Py_Buffer was released before
it.

To fix this, inject code to increase the reference count
and decrease it in the cleanup function.

Fixes: PYSIDE-1563
Change-Id: Ic4a47e0f458ed5b59b88813139102a9f1490a9df
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 7079bc4ffc63dd42054014b4b78bff78abed962b)
---
 sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 2 ++
 sources/pyside2/PySide2/glue/qtgui.cpp                  | 7 +++++++
 sources/pyside2/PySide2/templates/gui_common.xml        | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index 54f18e133..c2109cae7 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -768,6 +768,8 @@
       <include file-name="QStringList" location="global"/>
       <include file-name="QMatrix" location="global"/>
     </extra-includes>
+    <inject-code class="native" position="beginning"
+                 file="../glue/qtgui.cpp" snippet="qimage-decref-image-data"/>
 
     <modify-function signature="load(const QString&amp;, const char*)" allow-thread="yes"/>
     <modify-function signature="load(QIODevice*,const char*)" allow-thread="yes"/>
diff --git a/sources/pyside2/PySide2/glue/qtgui.cpp b/sources/pyside2/PySide2/glue/qtgui.cpp
index d96e9f78f..e3e25ebb5 100644
--- a/sources/pyside2/PySide2/glue/qtgui.cpp
+++ b/sources/pyside2/PySide2/glue/qtgui.cpp
@@ -172,6 +172,13 @@ for (int i = 0, i_max = %CPPSELF.count(); i < i_max; ++i){
 %0 = new %TYPE(QPixmap::fromImage(%1));
 // @snippet qpixmap
 
+// @snippet qimage-decref-image-data
+static void imageDecrefDataHandler(void *data)
+{
+    Py_DECREF(reinterpret_cast<PyObject *>(data));
+}
+// @snippet qimage-decref-image-data
+
 // @snippet qimage-constbits
 %PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(), %CPPSELF.byteCount());
 // @snippet qimage-constbits
diff --git a/sources/pyside2/PySide2/templates/gui_common.xml b/sources/pyside2/PySide2/templates/gui_common.xml
index a139a5fe9..1a7406799 100644
--- a/sources/pyside2/PySide2/templates/gui_common.xml
+++ b/sources/pyside2/PySide2/templates/gui_common.xml
@@ -80,8 +80,9 @@
     </template>
 
     <template name="qimage_buffer_constructor">
+        Py_INCREF(%PYARG_1);
         auto ptr = reinterpret_cast&lt;uchar*&gt;(Shiboken::Buffer::getPointer(%PYARG_1));
-        %0 = new %TYPE(ptr, %ARGS);
+        %0 = new %TYPE(ptr, %ARGS, imageDecrefDataHandler, %PYARG_1);
     </template>
 
     <template name="qcolor_repr">
-- 
cgit v1.2.3


From 90761561e875080fd04b16025213e5315dd0ee24 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 1 Jun 2021 08:58:39 +0200
Subject: mdi/application examples: Fix startup without settings file

Pass the proper default value when reading the geometry.

Fixes: PYSIDE-1584
Pick-to: 6.1 5.15
Change-Id: I6cff4e9e47b68704d6a75384a84c36268892b409
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 652b900df1676990b11fcfa379ef916091a79221)
---
 .../widgets/mainwindows/application/application.py     | 14 ++++++--------
 examples/widgets/mainwindows/mdi/mdi.py                | 18 ++++++++----------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/examples/widgets/mainwindows/application/application.py b/examples/widgets/mainwindows/application/application.py
index 8c4626f9b..5645a0746 100644
--- a/examples/widgets/mainwindows/application/application.py
+++ b/examples/widgets/mainwindows/application/application.py
@@ -189,16 +189,14 @@ class MainWindow(QtWidgets.QMainWindow):
         self.statusBar().showMessage("Ready")
 
     def readSettings(self):
-        settings = QtCore.QSettings("Trolltech", "Application Example")
-        pos = settings.value("pos", QtCore.QPoint(200, 200))
-        size = settings.value("size", QtCore.QSize(400, 400))
-        self.resize(size)
-        self.move(pos)
+        settings = QtCore.QSettings('QtProject', 'Application Example')
+        geometry = settings.value('geometry', QtCore.QByteArray())
+        if geometry.size():
+            self.restoreGeometry(geometry)
 
     def writeSettings(self):
-        settings = QtCore.QSettings("Trolltech", "Application Example")
-        settings.setValue("pos", self.pos())
-        settings.setValue("size", self.size())
+        settings = QtCore.QSettings('QtProject', 'Application Example')
+        settings.setValue('geometry', self.saveGeometry())
 
     def maybeSave(self):
         if self.textEdit.document().isModified():
diff --git a/examples/widgets/mainwindows/mdi/mdi.py b/examples/widgets/mainwindows/mdi/mdi.py
index 9daca826d..9eca5fdba 100644
--- a/examples/widgets/mainwindows/mdi/mdi.py
+++ b/examples/widgets/mainwindows/mdi/mdi.py
@@ -42,8 +42,8 @@
 
 """PySide2 port of the widgets/draganddrop/draggabletext example from Qt v5.x, originating from PyQt"""
 
-from PySide2.QtCore import (QFile, QFileInfo, QPoint, QSettings, QSignalMapper,
-        QSaveFile, QSize, QTextStream, Qt)
+from PySide2.QtCore import (QByteArray, QFile, QFileInfo, QPoint, QSettings,
+        QSignalMapper, QSaveFile, QSize, QTextStream, Qt)
 from PySide2.QtGui import QIcon, QKeySequence
 from PySide2.QtWidgets import (QAction, QApplication, QFileDialog, QMainWindow,
         QMdiArea, QMessageBox, QTextEdit, QWidget)
@@ -405,16 +405,14 @@ class MainWindow(QMainWindow):
         self.statusBar().showMessage("Ready")
 
     def readSettings(self):
-        settings = QSettings('Trolltech', 'MDI Example')
-        pos = settings.value('pos', QPoint(200, 200))
-        size = settings.value('size', QSize(400, 400))
-        self.move(pos)
-        self.resize(size)
+        settings = QSettings('QtProject', 'MDI Example')
+        geometry = settings.value('geometry', QByteArray())
+        if geometry.size():
+            self.restoreGeometry(geometry)
 
     def writeSettings(self):
-        settings = QSettings('Trolltech', 'MDI Example')
-        settings.setValue('pos', self.pos())
-        settings.setValue('size', self.size())
+        settings = QSettings('QtProject', 'MDI Example')
+        settings.setValue('geometry', self.saveGeometry())
 
     def activeMdiChild(self):
         activeSubWindow = self.mdiArea.activeSubWindow()
-- 
cgit v1.2.3


From fd212e9c380960c914476d077c700b4e3cfda9ee Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 2 Jun 2021 14:37:22 +0200
Subject: Fix error about not holding the GIL when releasing QImage memory

Fix: "Fatal Python error: Python memory allocator called without holding the GIL"
when running sources/pyside6/tests/QtWidgets/qimage_test.py

Acquire the GIL for releasing.

Amends a97698f0a5d011fd206db94cf73dba6353f39b29.

Task-number: PYSIDE-1563
Change-Id: Idf8dbf857f6dde76f80a78f581dacb3cf5fea16b
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 039776b1af905ab90ab49f6986214450e8099882)
---
 sources/pyside2/PySide2/glue/qtgui.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sources/pyside2/PySide2/glue/qtgui.cpp b/sources/pyside2/PySide2/glue/qtgui.cpp
index e3e25ebb5..58f84e3a6 100644
--- a/sources/pyside2/PySide2/glue/qtgui.cpp
+++ b/sources/pyside2/PySide2/glue/qtgui.cpp
@@ -175,7 +175,10 @@ for (int i = 0, i_max = %CPPSELF.count(); i < i_max; ++i){
 // @snippet qimage-decref-image-data
 static void imageDecrefDataHandler(void *data)
 {
+    // Avoid "Python memory allocator called without holding the GIL"
+    auto state = PyGILState_Ensure();
     Py_DECREF(reinterpret_cast<PyObject *>(data));
+    PyGILState_Release(state);
 }
 // @snippet qimage-decref-image-data
 
-- 
cgit v1.2.3


From 833e38e6cb2671c3c197b19f4b64c005c16a12c1 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 11 Jun 2021 12:55:20 +0200
Subject: Add QOpenGLPaintDevice

[ChangeLog][PySide2] QOpenGLPaintDevice has been added.

Fixes: PYSIDE-1090
Change-Id: Ia476a810f65956b73c28b1bed41da87bc28443f3
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
 sources/pyside2/PySide2/QtGui/CMakeLists.txt            | 2 +-
 sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
index c4a38a184..88d8be93f 100644
--- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
@@ -100,7 +100,7 @@ ${QtGui_GEN_DIR}/qopengldebugmessage_wrapper.cpp
 ${QtGui_GEN_DIR}/qopenglextrafunctions_wrapper.cpp
 ${QtGui_GEN_DIR}/qopenglframebufferobjectformat_wrapper.cpp
 ${QtGui_GEN_DIR}/qopenglfunctions_wrapper.cpp
-# Compile error on Windows: ${QtGui_GEN_DIR}/qopenglpaintdevice_wrapper.cpp
+${QtGui_GEN_DIR}/qopenglpaintdevice_wrapper.cpp
 ${QtGui_GEN_DIR}/qopenglpixeltransferoptions_wrapper.cpp
 ${QtGui_GEN_DIR}/qopenglshaderprogram_wrapper.cpp
 ${QtGui_GEN_DIR}/qopengltexture_wrapper.cpp
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index c2109cae7..e66ee48ce 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -2642,9 +2642,7 @@
     <enum-type name="FramebufferRestorePolicy" since="5.7"/>
   </object-type>
   <value-type name="QOpenGLFramebufferObjectFormat"/>
-  <!-- Compile error on Windows: QOpenGLPaintDevice::QOpenGLPaintDevice(const QOpenGLPaintDevice &)': attempting to reference a deleted function
   <object-type name="QOpenGLPaintDevice" since="5.0"/>
-  -->
   <object-type name="QOpenGLExtraFunctions" since="5.6">
       <!-- Exlusions due to compile errors -->
       <modify-function signature="glEndTransformFeedback()" remove="all"/>
-- 
cgit v1.2.3


From 80beaf70ff1a16f2d56c36582f4a0117aa5a3979 Mon Sep 17 00:00:00 2001
From: Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io>
Date: Fri, 11 Jun 2021 15:46:39 +0200
Subject: add changelog for 5.15.5

Change-Id: Ic0a0cf6320cd70e9d13427d7e56f8fecdf8b5cc3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 dist/changes-5.15.5 | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 dist/changes-5.15.5

diff --git a/dist/changes-5.15.5 b/dist/changes-5.15.5
new file mode 100644
index 000000000..02c98b0d2
--- /dev/null
+++ b/dist/changes-5.15.5
@@ -0,0 +1,30 @@
+Qt for Python 5.15.5 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                                 *
+****************************************************************************
+
+ - Crashes in QClipboard.mimeData(), QTextCursor.currentList() and
+   QTextCursor.currentTable() have been fixed.
+ - Fixed issues where __feature__ was affected by other imports.
+ - Fixed crashes on QImage(uchar *) constructors, related to GIL handling.
+ - QOpenGLPaintDevice has been added.
+
+****************************************************************************
+*                                  Shiboken2                               *
+****************************************************************************
+
+ - No changes
-- 
cgit v1.2.3


From fde37d5b64e68bbc439a95a16a28981dc2454083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simo=20F=C3=A4lt?= <simo.falt@qt.io>
Date: Mon, 14 Jun 2021 13:41:43 +0300
Subject: Drop MacOS_10_15 from CI configs due to missing libclang

There is a provisioning shortage with 10.15 and it is missing required
libs.

Change-Id: I939bf7278da49075d15c2394b2d8744ccb8ff03e
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
 coin/module_config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 6169ce910..99778cce6 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -18,7 +18,7 @@ accept_configuration:
             not_contains_value: -no-gui
           - condition: property   # Following configs are not supported
             property: target.osVersion
-            not_in_values: [OPENSUSE_13_01, QEMU, WebAssembly, Ubuntu_18_04, SLES_12, SLES_15]
+            not_in_values: [OPENSUSE_13_01, QEMU, WebAssembly, Ubuntu_18_04, SLES_12, SLES_15, MacOS_10_15]
           - condition: property  # MibnGW and msvc2015 are not supported
             property: target.compiler
             not_in_values: [Mingw, MSVC2015]
-- 
cgit v1.2.3


From 62c511ffa618db47b5e58dd20bb9d021befec3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simo=20F=C3=A4lt?= <simo.falt@qt.io>
Date: Mon, 14 Jun 2021 09:24:16 +0300
Subject: Update version strings to 5.15.5

Change-Id: I36a805bb033ac4fbcad8f1062a5612a803b448a1
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
 sources/pyside2/pyside_version.py     | 2 +-
 sources/shiboken2/shiboken_version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py
index 8b9cac53b..8484a5cc0 100644
--- a/sources/pyside2/pyside_version.py
+++ b/sources/pyside2/pyside_version.py
@@ -21,7 +21,7 @@
 
 major_version = "5"
 minor_version = "15"
-patch_version = "4"
+patch_version = "5"
 
 # For example: "a", "b", "rc"
 # (which means "alpha", "beta", "release candidate").
diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken2/shiboken_version.py
index 8b9cac53b..8484a5cc0 100644
--- a/sources/shiboken2/shiboken_version.py
+++ b/sources/shiboken2/shiboken_version.py
@@ -21,7 +21,7 @@
 
 major_version = "5"
 minor_version = "15"
-patch_version = "4"
+patch_version = "5"
 
 # For example: "a", "b", "rc"
 # (which means "alpha", "beta", "release candidate").
-- 
cgit v1.2.3


From bd4180ffdd47d423b0bd2b995b09df474b8c5a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simo=20F=C3=A4lt?= <simo.falt@qt.io>
Date: Mon, 14 Jun 2021 09:22:28 +0300
Subject: Pin qt5 dependency to Qt lts-5.15.5 release

Change-Id: I8c9d1e62c1f94e4f8a0abac06585af219d0dac74
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
 coin/dependencies.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coin/dependencies.yaml b/coin/dependencies.yaml
index c2717bc08..af5c36172 100644
--- a/coin/dependencies.yaml
+++ b/coin/dependencies.yaml
@@ -1,6 +1,6 @@
 product_dependency:
   ../../qt/tqtc-qt5.git:
-    ref: "ce5066de40100b04dee7087c7b860693b379c990"
+    ref: "743ae9f98d7cc67c4956886209f39fcd5a28466f"
 dependency_source: supermodule
 dependencies: [
       "../../qt/qt3d",
-- 
cgit v1.2.3