diff options
| -rw-r--r-- | .cmake.conf | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/.cmake.conf b/.cmake.conf index a63f70d6b9..848faeb55d 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -13,5 +13,5 @@ set(QT_MIN_SUPPORTED_CMAKE_VERSION "3.16") # 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") +set(QT_MIN_NEW_POLICY_CMAKE_VERSION "3.16") +set(QT_MAX_NEW_POLICY_CMAKE_VERSION "3.20") diff --git a/CMakeLists.txt b/CMakeLists.txt index 334c2496c7..35ee14102e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,9 @@ # Need an explicit call at the top level. This is the absolute minimum version # needed to configure the project with any combination of enabled features. # The call to qt_build_repo_begin() will upgrade policies further. +# +# The absolute minimum version for building Qt is 3.16 because for metatype.json generation, we +# depend on being able to find the location of json files created by AUTOMOC/moc. cmake_minimum_required(VERSION 3.16) # Get the repo version and CMake policy details diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index f100e4ab44..7ebe0a5744 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -1,5 +1,5 @@ # These values should be kept in sync with those in qtbase/.cmake.conf -cmake_minimum_required(VERSION 3.14...3.19) +cmake_minimum_required(VERSION 3.16...3.20) ############################################### # |