aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2022-10-11 11:24:28 +0300
committerSimo Fält <simo.falt@qt.io>2022-10-11 11:33:18 +0300
commitf76661cc00423e357ae5bf43aa13f8513c038da4 (patch)
treeea147665807b03ad6dc32f11f5d27e72889c07ff
parentbb17cdb72aaf1841cab8122b43333688334f5ace (diff)
Pin qt5 sha1 for 6.4.0 release and clean version stringsv6.4.0
Change-Id: I433ee01c9cdaaff6f24c54d7472bfacc68d8affc Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r--coin/dependencies.yaml2
-rw-r--r--sources/pyside6/.cmake.conf4
-rw-r--r--sources/shiboken6/.cmake.conf4
3 files changed, 5 insertions, 5 deletions
diff --git a/coin/dependencies.yaml b/coin/dependencies.yaml
index 45737ce42..5a7fea00f 100644
--- a/coin/dependencies.yaml
+++ b/coin/dependencies.yaml
@@ -1,6 +1,6 @@
product_dependency:
../../qt/qt5:
- ref: "6.4"
+ ref: "4dd306e47c762abc39995fa23f0c2a07d6c78557"
dependency_source: supermodule
dependencies: [
"../../qt/qt3d",
diff --git a/sources/pyside6/.cmake.conf b/sources/pyside6/.cmake.conf
index 7ed64b147..df1f2e064 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_PRE_RELEASE_VERSION_TYPE "")
+set(pyside_PRE_RELEASE_VERSION "")
diff --git a/sources/shiboken6/.cmake.conf b/sources/shiboken6/.cmake.conf
index e9e426412..36ce03142 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_PRE_RELEASE_VERSION_TYPE "")
+set(shiboken_PRE_RELEASE_VERSION "")