From 769c8d1c5401dc9e08d37b80a1cd26458bfcd07d Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Mon, 28 Jun 2021 10:46:46 +0300 Subject: Conan: Support builds with Conan Provide conanfile.py recipe to support building this module with Conan. The conanfile.py recipe inherits the main functionality from base class located in qt-conan-common.git. 'qt-configure-module(.bat)' and cmake is used for the builds. Dependencies (Conan requirements) are defined by the base class implementation which reads those from the 'dependencies.yaml' which is also used by the Coin/CI. Pick-to: 6.2 Task-number: QTBUG-94815 Change-Id: I5d98fc10847b4608225df4ce7b3a37f718463c6f Reviewed-by: Jani Heikkinen 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.1