summaryrefslogtreecommitdiffstats
path: root/.cmake.conf
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@qt.io>2021-06-28 10:15:33 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-19 08:03:43 +0000
commitdd49b60f636476dad8946ed91364dbe7d26e8527 (patch)
tree483298cf622d807241d236a8bfd6035fc8a8f7ab /.cmake.conf
parent84c2f8673a8e6298a63925b28dd125146d6f9c00 (diff)
Support builds with Conan
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-94814 Change-Id: I8796766dbad4ff9061d78eb56711b24149e21c09 Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit c4f2536b5fa5808b18a6e05897d1a6c5153e9d53) 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")