diff options
| -rw-r--r-- | dist/changes-5.14.2.1 | 32 | ||||
| -rw-r--r-- | sources/pyside2/pyside_version.py | 6 | ||||
| -rw-r--r-- | sources/pyside2/tests/QtCore/versioninfo_test.py | 2 | ||||
| -rw-r--r-- | sources/shiboken2/shiboken_version.py | 6 |
4 files changed, 39 insertions, 7 deletions
diff --git a/dist/changes-5.14.2.1 b/dist/changes-5.14.2.1 new file mode 100644 index 000000000..71a873484 --- /dev/null +++ b/dist/changes-5.14.2.1 @@ -0,0 +1,32 @@ +Qt for Python 5.14.2.1 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 * +**************************************************************************** + + + - [PYSIDE-841] Add an example for QUiLoader + - [PYSIDE-1253] Fix lockups in QMetaObject.invokeMethod with + BlockingQueuedConnection + +**************************************************************************** +* Shiboken2 * +**************************************************************************** + + - [PYSIDE-813] Fix race condition with unprotected Py_INCREFs + - [PYSIDE-1255] Fix Qt properties not working in classes inheriting QObject + - [PYSIDE-1259] Support Clang version 10 + - [PYSIDE-1266] Fix documentation error in "Getting Started" diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py index 0e0943143..fc04d00a7 100644 --- a/sources/pyside2/pyside_version.py +++ b/sources/pyside2/pyside_version.py @@ -39,15 +39,15 @@ major_version = "5" minor_version = "14" -patch_version = "2" +patch_version = "2.1" # For example: "a", "b", "rc" # (which means "alpha", "beta", "release candidate"). # An empty string means the generated package will be an official release. -pre_release_version_type = "a" +pre_release_version_type = "" # For example: "1", "2" (which means "beta1", "beta2", if type is "b"). -pre_release_version = "1" +pre_release_version = "" if __name__ == '__main__': # Used by CMake. diff --git a/sources/pyside2/tests/QtCore/versioninfo_test.py b/sources/pyside2/tests/QtCore/versioninfo_test.py index c682dbbdc..8b93fde8d 100644 --- a/sources/pyside2/tests/QtCore/versioninfo_test.py +++ b/sources/pyside2/tests/QtCore/versioninfo_test.py @@ -44,7 +44,7 @@ class TestVersionInfo(unittest.TestCase): self.assertEqual(len(v), 5) self.assertEqual(type(v[0]), int) self.assertEqual(type(v[1]), int) - self.assertEqual(type(v[2]), int) + #self.assertEqual(type(v[2]), int) disabled for 5.14.2.1 fix self.assertEqual(type(v[3]), str) self.assertEqual(type(v[4]), str) diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken2/shiboken_version.py index 0e0943143..fc04d00a7 100644 --- a/sources/shiboken2/shiboken_version.py +++ b/sources/shiboken2/shiboken_version.py @@ -39,15 +39,15 @@ major_version = "5" minor_version = "14" -patch_version = "2" +patch_version = "2.1" # For example: "a", "b", "rc" # (which means "alpha", "beta", "release candidate"). # An empty string means the generated package will be an official release. -pre_release_version_type = "a" +pre_release_version_type = "" # For example: "1", "2" (which means "beta1", "beta2", if type is "b"). -pre_release_version = "1" +pre_release_version = "" if __name__ == '__main__': # Used by CMake. |