From c4f2536b5fa5808b18a6e05897d1a6c5153e9d53 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Mon, 28 Jun 2021 10:15:33 +0300 Subject: 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. Pick-to: 6.2 Task-number: QTBUG-94814 Change-Id: I8796766dbad4ff9061d78eb56711b24149e21c09 Reviewed-by: Ievgenii Meshcheriakov Reviewed-by: Edward Welbourne Reviewed-by: Toni Saario --- .cmake.conf | 1 + 1 file changed, 1 insertion(+) (limited to '.cmake.conf') 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") -- cgit v1.2.3