lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 11:26:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set Conan V2 mode

Browse Source 
V2 mode causes conan to raise error when an feature that is being
deprecated in conan V2 is used. This allows maintaining V2 compatibility.

Change-Id: I9c0cb70ce3a194966594d48433763e5423e187f1
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit dfa50ed7c3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Toni Saario
2021-08-26 14:07:53 +03:00
committed by Qt Cherry-pick Bot
parent a281a7a4fe
commit c7ca7a645c
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coin/provisioning/common/unix/install-conan.sh
View File

@@ -12,6 +12,7 @@ os="$1"
pip3 install conan --user
SetEnvVar "CONAN_REVISIONS_ENABLED" "1"
SetEnvVar "CONAN_V2_MODE" "1"
if [ "$os" == "linux" ]; then
SetEnvVar "PATH" "/home/qt/.local/bin:\$PATH"

1
coin/provisioning/common/windows/conan.ps1
View File

@@ -41,6 +41,7 @@ Write-Output "Conan = $version" >> ~\versions.txt
# Add conan to path.
Add-Path $scriptsPath
Set-EnvironmentVariable "CONAN_REVISIONS_ENABLED" "1"
Set-EnvironmentVariable "CONAN_V2_MODE" "1"
# This is temporary solution for installing packages provided by Conan until we have fixed Conan setup for this