summaryrefslogtreecommitdiffstats
path: root/.cmake.conf
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@qt.io>2021-06-24 09:45:52 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-26 08:58:10 +0000
commitb9a5e8c65f5d1cd6f75f74638525c92264e9dcb7 (patch)
tree0e5be12ce3dda858e1c1d1470b0304253534c484 /.cmake.conf
parent47327eaf58a71704d28c1d80efadc7d2923924c9 (diff)
Conan: Inherit recipe class from QtLeafModule for common functionality
The recipe uses Conan's supported way to inherit from a given base class via 'python_requires_extend'. 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-94758 Change-Id: I61baf3f96a027ee374af6b16ba370fb85a2e698c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 91974f11f12091d94d5c5f85a3368aa1844ee580) 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 4e73b3d60..4aa8eb1fd 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")