aboutsummaryrefslogtreecommitdiffstats
path: root/.cmake.conf
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@qt.io>2021-04-14 10:03:39 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-21 10:07:38 +0000
commitb89ed0c19526a46fb51a1118948ada3bb2f61676 (patch)
tree6b8688010621f01265caeec69aa875cefd4747da /.cmake.conf
parent9ce1ace1d79a581c26e296514badbc84ba61779c (diff)
Add conanfile.py to support builds with Conan
The build recipe uses the qtbase's 'bin/qt-configure-module' script directly which is recommended when building other Qt modules ouside the qtbase's -prefix. The recipe uses functionality from qt-conan-common Conan package via 'python_requires'. This recipe sets it's own Conan options that match with the module configure options. The recipe sets it's version number based on QT_REPO_MODULE_VERSION and QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT in .cmake.conf file. The dependency to qtbase, qtsvg and qtshadertools is declared using semantic versioning so that it will pick the latest available prerelease or final version of the major.minor.patch. Task-number: QTBUG-94384 Change-Id: I1f12434521d11f63c31a102bfbfaf923cb262965 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit d6ea619ac87a5ff9ed239b34a4c43a7e6fa141a0) 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 4e73b3d607..4aa8eb1fde 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")