aboutsummaryrefslogtreecommitdiffstats
diff options
authorAkseli Salovaara <akseli.salovaara@qt.io>2025-02-03 13:27:22 +0200
committerAkseli Salovaara <akseli.salovaara@qt.io>2025-02-04 06:28:37 +0200
commitf62088b4cd516a3080a6b2e68bc79903da8b67ce (patch)
treed2dfb1409780eec234ed58118cea50eea9428f7d
parente53928f28b610f427a7836ce1f852c73b7a6e01f (diff)
Bump version numbers for 6.8.2.1 fix releasev6.8.2.16.8.2
Disable test for patch version number as integer changes to string. Change-Id: If2c21fbd4174449775a254cddfe2d9d52a78ff19 Reviewed-by: Simo Fält <simo.falt@qt.io>
-rw-r--r--sources/pyside6/.cmake.conf2
-rw-r--r--sources/pyside6/tests/QtCore/versioninfo_test.py2
-rw-r--r--sources/shiboken6/.cmake.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/sources/pyside6/.cmake.conf b/sources/pyside6/.cmake.conf
index 70f6aef1d..86ca5ff45 100644
--- a/sources/pyside6/.cmake.conf
+++ b/sources/pyside6/.cmake.conf
@@ -1,5 +1,5 @@
set(pyside_MAJOR_VERSION "6")
set(pyside_MINOR_VERSION "8")
-set(pyside_MICRO_VERSION "2")
+set(pyside_MICRO_VERSION "2.1")
set(pyside_PRE_RELEASE_VERSION_TYPE "")
set(pyside_PRE_RELEASE_VERSION "")
diff --git a/sources/pyside6/tests/QtCore/versioninfo_test.py b/sources/pyside6/tests/QtCore/versioninfo_test.py
index 342c3adf0..a12484e8a 100644
--- a/sources/pyside6/tests/QtCore/versioninfo_test.py
+++ b/sources/pyside6/tests/QtCore/versioninfo_test.py
@@ -22,7 +22,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)
self.assertEqual(type(v[3]), str)
self.assertEqual(type(v[4]), str)
diff --git a/sources/shiboken6/.cmake.conf b/sources/shiboken6/.cmake.conf
index d0a87ce75..8c7d76c02 100644
--- a/sources/shiboken6/.cmake.conf
+++ b/sources/shiboken6/.cmake.conf
@@ -1,5 +1,5 @@
set(shiboken_MAJOR_VERSION "6")
set(shiboken_MINOR_VERSION "8")
-set(shiboken_MICRO_VERSION "2")
+set(shiboken_MICRO_VERSION "2.1")
set(shiboken_PRE_RELEASE_VERSION_TYPE "")
set(shiboken_PRE_RELEASE_VERSION "")