summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <[email protected]>2023-09-25 10:35:46 +0300
committerJani Heikkinen <[email protected]>2023-09-26 15:31:37 +0300
commitadbc399e9084941695b057ad7ffd3f1d83760367 (patch)
tree5c8de88e5751c01444adce403229ac6810919f56
parentb426cdc1f645ddb3514f97467986b860dfcd1f54 (diff)
Bump version to 6.5.4
Change-Id: Idfaac83dc29341b29cdd45e22ff5efb453b4394c Reviewed-by: Jani Heikkinen <[email protected]>
-rw-r--r--.cmake.conf2
-rw-r--r--src/plugins/sqldrivers/.cmake.conf2
-rw-r--r--tests/auto/cmake/mockplugins/.cmake.conf2
-rw-r--r--tests/auto/cmake/test_generating_cpp_exports/.cmake.conf2
-rw-r--r--tests/auto/cmake/test_static_resources/.cmake.conf2
-rwxr-xr-xutil/cmake/pro2cmake.py2
6 files changed, 6 insertions, 6 deletions
diff --git a/.cmake.conf b/.cmake.conf
index 889ca7d8ba4..4a0ff4a81bd 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -8,7 +8,7 @@ if (NOT DEFINED QT_SUPERBUILD OR DEFINED QT_REPO_MODULE_VERSION)
list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
endif()
-set(QT_REPO_MODULE_VERSION "6.5.3")
+set(QT_REPO_MODULE_VERSION "6.5.4")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_COPYRIGHT_YEAR "2023")
diff --git a/src/plugins/sqldrivers/.cmake.conf b/src/plugins/sqldrivers/.cmake.conf
index 20ad9f78d93..1193d1ed907 100644
--- a/src/plugins/sqldrivers/.cmake.conf
+++ b/src/plugins/sqldrivers/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.5.3")
+set(QT_REPO_MODULE_VERSION "6.5.4")
diff --git a/tests/auto/cmake/mockplugins/.cmake.conf b/tests/auto/cmake/mockplugins/.cmake.conf
index 20ad9f78d93..1193d1ed907 100644
--- a/tests/auto/cmake/mockplugins/.cmake.conf
+++ b/tests/auto/cmake/mockplugins/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.5.3")
+set(QT_REPO_MODULE_VERSION "6.5.4")
diff --git a/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf b/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf
index 20ad9f78d93..1193d1ed907 100644
--- a/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf
+++ b/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.5.3")
+set(QT_REPO_MODULE_VERSION "6.5.4")
diff --git a/tests/auto/cmake/test_static_resources/.cmake.conf b/tests/auto/cmake/test_static_resources/.cmake.conf
index 20ad9f78d93..1193d1ed907 100644
--- a/tests/auto/cmake/test_static_resources/.cmake.conf
+++ b/tests/auto/cmake/test_static_resources/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.5.3")
+set(QT_REPO_MODULE_VERSION "6.5.4")
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index 4b657904aa0..fbdf9877f8f 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -4666,7 +4666,7 @@ def create_top_level_cmake_conf():
conf_file_name = ".cmake.conf"
try:
with open(conf_file_name, "x") as file:
- file.write('set(QT_REPO_MODULE_VERSION "6.5.3")\n')
+ file.write('set(QT_REPO_MODULE_VERSION "6.5.4")\n')
except FileExistsError:
pass