From dfa50ed7c3d2acac35d1a13ccec618fba8064d6f Mon Sep 17 00:00:00 2001
From: Toni Saario <toni.saario@qt.io>
Date: Thu, 26 Aug 2021 14:07:53 +0300
Subject: [PATCH] Set Conan V2 mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Pick-to: 6.2
Change-Id: I9c0cb70ce3a194966594d48433763e5423e187f1
Reviewed-by: Simo Fält <simo.falt@qt.io>
---
 coin/provisioning/common/unix/install-conan.sh | 1 +
 coin/provisioning/common/windows/conan.ps1     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/coin/provisioning/common/unix/install-conan.sh b/coin/provisioning/common/unix/install-conan.sh
index 6827f6fe..f30a2300 100755
--- a/coin/provisioning/common/unix/install-conan.sh
+++ b/coin/provisioning/common/unix/install-conan.sh
@@ -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"
diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1
index 082600e9..5c635d3c 100644
--- a/coin/provisioning/common/windows/conan.ps1
+++ b/coin/provisioning/common/windows/conan.ps1
@@ -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