aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2022-12-20 14:46:07 +0200
committerSimo Fält <simo.falt@qt.io>2022-12-21 09:04:50 +0200
commit6184ed5275b2e1736f68d29ff632bbe228afcf45 (patch)
tree590aaea3ba9ff39a5796911d1fc9a429541b670a
parent6b152dd69c93a7e873bdd57d7f7460e602399308 (diff)
Pin Qt5 sha1 and update version strings for 6.4.2 release
Change-Id: Id52bf85c2ddadea4c0212b90be4b92ea09d2a99f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--coin/dependencies.yaml2
-rw-r--r--sources/pyside6/.cmake.conf6
-rw-r--r--sources/shiboken6/.cmake.conf6
3 files changed, 7 insertions, 7 deletions
diff --git a/coin/dependencies.yaml b/coin/dependencies.yaml
index 45737ce42..c71771568 100644
--- a/coin/dependencies.yaml
+++ b/coin/dependencies.yaml
@@ -1,6 +1,6 @@
product_dependency:
../../qt/qt5:
- ref: "6.4"
+ ref: "0dff19cc15980da93fadfae4709363ee76e6b755"
dependency_source: supermodule
dependencies: [
"../../qt/qt3d",
diff --git a/sources/pyside6/.cmake.conf b/sources/pyside6/.cmake.conf
index 7ed64b147..fd46b3c7d 100644
--- a/sources/pyside6/.cmake.conf
+++ b/sources/pyside6/.cmake.conf
@@ -1,5 +1,5 @@
set(pyside_MAJOR_VERSION "6")
set(pyside_MINOR_VERSION "4")
-set(pyside_MICRO_VERSION "0")
-set(pyside_PRE_RELEASE_VERSION_TYPE "a")
-set(pyside_PRE_RELEASE_VERSION "1")
+set(pyside_MICRO_VERSION "2")
+set(pyside_PRE_RELEASE_VERSION_TYPE "")
+set(pyside_PRE_RELEASE_VERSION "")
diff --git a/sources/shiboken6/.cmake.conf b/sources/shiboken6/.cmake.conf
index e9e426412..9409f7496 100644
--- a/sources/shiboken6/.cmake.conf
+++ b/sources/shiboken6/.cmake.conf
@@ -1,5 +1,5 @@
set(shiboken_MAJOR_VERSION "6")
set(shiboken_MINOR_VERSION "4")
-set(shiboken_MICRO_VERSION "0")
-set(shiboken_PRE_RELEASE_VERSION_TYPE "a")
-set(shiboken_PRE_RELEASE_VERSION "1")
+set(shiboken_MICRO_VERSION "2")
+set(shiboken_PRE_RELEASE_VERSION_TYPE "")
+set(shiboken_PRE_RELEASE_VERSION "")