summaryrefslogtreecommitdiffstats
path: root/.cmake.conf
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@qt.io>2021-03-23 09:06:07 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-26 05:26:09 +0000
commitb446533259ddf69ae71bbffd52641b2b5520eeca (patch)
treee9c0c31474332f032ccd1ef0bafa042e08a692a0 /.cmake.conf
parent0ac596a452cd8ebcad3585c8635edda68baf14ad (diff)
Conan: Inherit recipe class from QtLeafModule for common functionality
The qt-conan-common package implements a base class for Qt leaf module recipes. The build steps in leaf modules are mostly identical so it makes sense to put those in the base class. Dependencies are read by the base class from the 'dependencies.yaml' which is the same file the CI system uses. Inheriting class needs to implement 'get_leaf_module_source_folder()'. Task-number: QTBUG-94902 Change-Id: I7cec8a66bfaae3a75e93b1f31ee33c9defda4fe3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit fcd9d6f66049f83a67a8fefcb9002f89496be01a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to '.cmake.conf')
-rw-r--r--.cmake.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/.cmake.conf b/.cmake.conf
index 4e73b3d6..4aa8eb1f 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1 +1,2 @@
set(QT_REPO_MODULE_VERSION "6.2.0")
+set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")