99899dd299
This reverts commit 657525965b.
The change relied on reading the last value of the
CMAKE_MINIMUM_REQUIRED_VERSION variable before one of the Qt packages
is found to use it for the version check.
Even if a user project has a cmake_minimum_required() right at
the beginning of the project with a supported version specified,
the first project() call which loads a CMake toolchain file could
contain another cmake_minimum_required() call with a lower
(unsupported) version and that version would be used for the check,
failing the project configuration.
The Android NDK ships such a toolchain file, which requires version
'3.6'.
Thus, relying on the last value of CMAKE_MINIMUM_REQUIRED_VERSION is
not robust enough.
Pick-to: 6.2
Task-number: QTBUG-95018
Task-number: QTBUG-95832
Change-Id: Iff3cb0a46e6e878569dce9c5fe915a714a034904
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
25 lines
1.2 KiB
Plaintext
25 lines
1.2 KiB
Plaintext
set(QT_REPO_MODULE_VERSION "6.3.0")
|
|
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
|
|
|
|
# Minimum requirement for building Qt
|
|
set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_BUILDING_QT_SHARED "3.16")
|
|
set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_BUILDING_QT_STATIC "3.21")
|
|
|
|
# Minimum requirement for consuming Qt in a user project.
|
|
# This might be different in the future, e.g. be lower than the requirement for
|
|
# building Qt.
|
|
set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_USING_QT_SHARED "3.16")
|
|
set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_USING_QT_STATIC "3.21")
|
|
|
|
# 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.16")
|
|
set(QT_MAX_NEW_POLICY_CMAKE_VERSION "3.21")
|