summaryrefslogtreecommitdiffstats
path: root/.cmake.conf
diff options
context:
space:
mode:
Diffstat (limited to '.cmake.conf')
-rw-r--r--.cmake.conf18
1 files changed, 16 insertions, 2 deletions
diff --git a/.cmake.conf b/.cmake.conf
index b8e9ae6735..8744479d6f 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1,2 +1,16 @@
-set(QT_REPO_MODULE_VERSION "6.0.0")
-set(QT_MIN_SUPPORTED_CMAKE_VERSION "3.18")
+set(QT_REPO_MODULE_VERSION "6.1.0")
+
+# Minimum requirement for building Qt
+set(QT_MIN_SUPPORTED_CMAKE_VERSION "3.16")
+
+# Policy settings for commands defined by qtbase. These will also be injected
+# into the top level policy scope of each Qt module when building Qt so that
+# modules have the same policy settings as qtbase by default. They can be
+# overridden by individual Qt modules in their own .cmake.conf files if needed.
+#
+# NOTE: These two values are also hard-coded in QtBuildInternalsConfig.cmake
+# because that file is used in-place by a superbuild, so there is no
+# opportunity for substituting the values from here. Keep both locations
+# in sync.
+set(QT_MIN_NEW_POLICY_CMAKE_VERSION "3.14")
+set(QT_MAX_NEW_POLICY_CMAKE_VERSION "3.19")