diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2021-05-12 11:50:42 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@qt.io> | 2021-08-26 13:56:17 +0300 |
| commit | 1822895b455bc94d911c8c1e93e252af796133e2 (patch) | |
| tree | 2bab27142731ab6a752132d0efddec7ef6319db2 /.cmake.conf | |
| parent | 119359606b0f71aad9ba0cf1f69e45b66ab3fbef (diff) | |
| download | qtserialport-1822895b455bc94d911c8c1e93e252af796133e2.tar.gz | |
Update conan support
This patch updates the conanfile.py to support the full Qt build using
conan. qtbase is now listed as a dependency, and the build recipe uses
the qtbase's 'qt-configure-module' script directly.
Use shared recipe functionality from qt-conan-common package.
This change is also required for QtPositioning module, as it has an
optional dependency on QtSerialPort.
Pick-to: 6.2
Task-number: QTBUG-90800
Change-Id: I54f9f717f8fec98f9617385c8533b116ad0e9d1c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to '.cmake.conf')
| -rw-r--r-- | .cmake.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.cmake.conf b/.cmake.conf index 4e73b3d..4aa8eb1 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") |