08448a5f48
The status information (alpha1, beta2, rc3, ...) needs to be part of the Conan package reference. As Conan supports semantic versioning the best place to put the status is to append it to the version string: qtbase/6.2.0-alpha1@qt/everywhere qtbase/6.2.0-beta2@qt/everywhere qtbase/6.2.0-rc3@qt/everywhere qtbase/6.2.0@qt/everywhere Other Conan packages declaring a dependency can use e.g. syntax: # notice the asterix character after version self.requires(f"qtbase/[<=<version>, include_prerelease=True}]@..) This way the status information is not in the Conan channel part and downstream consumers of the Conan package does not need to update the dependency (Conan reference string) every time the version changes. Put the status information next to Qt version string in .cmake.cache. Task-number: QTBUG-94385 Pick-to: 6.2 Change-Id: Ib277f99ea1e87253b93f59e463bd6c7dd8b3203e Reviewed-by: Toni Saario <toni.saario@qt.io>
18 lines
822 B
Plaintext
18 lines
822 B
Plaintext
set(QT_REPO_MODULE_VERSION "6.2.0")
|
|
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
|
|
|
|
# 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")
|