aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2023-06-05 07:39:25 +0300
committerSimo Fält <simo.falt@qt.io>2023-06-05 07:45:37 +0300
commit16568dc895e786147a5597dc26c007337466304e (patch)
tree657578ef11e5899e7ada77a642bce65b415eec71
parent80da3a11d0faade9baed726f90bd44cf38ce811b (diff)
Update version for 6.5.1.1 patch releasev6.5.1.16.5.1
Change-Id: I61690a123002f818ec7d3e0abb34f0e49a49b52f Reviewed-by: Jani Heikkinen <jani.heikkinen@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 112475780..4263f475f 100644
--- a/sources/pyside6/.cmake.conf
+++ b/sources/pyside6/.cmake.conf
@@ -1,5 +1,5 @@
set(pyside_MAJOR_VERSION "6")
set(pyside_MINOR_VERSION "5")
-set(pyside_MICRO_VERSION "1")
+set(pyside_MICRO_VERSION "1.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 63414378a..5000cf173 100644
--- a/sources/pyside6/tests/QtCore/versioninfo_test.py
+++ b/sources/pyside6/tests/QtCore/versioninfo_test.py
@@ -21,7 +21,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 6.5.1.1
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 269728aa7..5fed5e6c9 100644
--- a/sources/shiboken6/.cmake.conf
+++ b/sources/shiboken6/.cmake.conf
@@ -1,5 +1,5 @@
set(shiboken_MAJOR_VERSION "6")
set(shiboken_MINOR_VERSION "5")
-set(shiboken_MICRO_VERSION "1")
+set(shiboken_MICRO_VERSION "1.1")
set(shiboken_PRE_RELEASE_VERSION_TYPE "")
set(shiboken_PRE_RELEASE_VERSION "")