aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToni Saario <toni.saario@qt.io>2021-05-31 14:20:02 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-12-07 12:44:05 +0000
commitfd3f33165b3e7a7c9c8ebaf814f39cefadbd7b6d (patch)
tree9f806d1328483901c65e608c4caa21ec3f20a701
parent3354c21ce08449d137bc361ccd30e6dc46571898 (diff)
Remove existing conan settings file
Due to existing conan file new versions of compilers etc. cannot be used. Forcing Conan to generate a new one will allow using the new versions in profile files. Change-Id: I5adc1a42a4d620656767eb1418f341ef50232f91 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit b2240d78cd26b5323e40708abf99d305f4601c35) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--coin/provisioning/common/windows/conan.ps13
1 files changed, 3 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1
index 9b212fdd..8e65c3ec 100644
--- a/coin/provisioning/common/windows/conan.ps1
+++ b/coin/provisioning/common/windows/conan.ps1
@@ -60,3 +60,6 @@ Extract-7Zip $conanhome_compressed C:\Users\qt
Remove $conan_compressed
Remove $conanhome_compressed
+
+# Remove existing settings file to generate a new.
+Remove "C:\Users\qt\.conan\settings.yml"