summaryrefslogtreecommitdiffstats
path: root/.cmake.conf
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@qt.io>2021-06-28 10:55:31 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-26 06:58:47 +0000
commit8234fb149d812b9ac99be466cd5e025029aaa38c (patch)
treea9e2c316c0f5bb720f1a36166654c2dedcee4a68 /.cmake.conf
parent25f34210a1975e92f816ed61f676e2111aa8f6b7 (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. Task-number: QTBUG-94816 Change-Id: Idb08326dc13b90b2a70db3a2f53e5a4d4a348adb Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit c49ae50dc3bb0cf4235c85333a42fb5b91962a2f) 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 4e73b3d..4aa8eb1 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")