diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-06 19:21:59 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-07 19:40:36 +0100 |
| commit | f65308d3713a49278d28281a4065c0b84b49df7c (patch) | |
| tree | 80d840e43940ba2641b6eb7c22253a25253b57c6 /coin/provisioning/common/03-conan.ps1 | |
| parent | 82cea365312698b0aae777b8affaa99544b4bc05 (diff) | |
| parent | ad3c5195259321ab8420df0dee1a9b14cfc4811b (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
This change also integrated latest dev branch of qtremoteobjects
and qtwebengine.
Conflicts:
.gitmodules
qtremoteobjects
qtwebengine
Change-Id: Ic6f97f43c55bdca5d8ac0481f3bb8a73429657b9
Diffstat (limited to 'coin/provisioning/common/03-conan.ps1')
| -rw-r--r-- | coin/provisioning/common/03-conan.ps1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1 index 04be729d..6a4b4ebb 100644 --- a/coin/provisioning/common/03-conan.ps1 +++ b/coin/provisioning/common/03-conan.ps1 @@ -2,7 +2,7 @@ $scriptsPath = "C:\Python27\Scripts" -& "$scriptsPath\pip.exe" install --upgrade conan==0.16.0 +& "$scriptsPath\pip.exe" install --upgrade conan==0.20.2 [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") |