3 Commits

Author	SHA1	Message	Date
Simon Hausmann	591c6d0446	Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: coin/provisioning/common/02-python.ps1 Change-Id: I6b5f2c464cc350798c7c73fba9e79a3f4f534586	2016-12-21 21:38:29 +01:00
Konstantin Tokarev	fa00780be3	When installing Python ensure that pip is installed too ... If Python is not deinstalled cleanly (01-windows_removethemall.ps1 just erases installation directory) pip is not bootstrapped by new installation. Fix it by running ensurepip module. Change-Id: I3a7ed87eed30118876d7022eed94b8a571677529 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2016-11-18 22:19:26 +00:00
Konstantin Tokarev	f8e075a679	Install conan from pip instead of exe ... This allows us to get it working on 32-bit Windows. Also renamed conan.ps1 and python.ps1 to get proper provisioning order. Change-Id: I2f21db7dd0edbacb4e44024d1c70b315fba55801 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2016-11-16 21:25:32 +00:00