lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-18 19:16:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,382 Commits 120 Branches 274 Tags
8aa0940eef7aa5e7490e7168fa89675ebd5bc8cf
Commit Graph

3 Commits

Author SHA1 Message Date
Konstantin Tokarev
aafc3f8644 Use full paths for invoking stuff from Python27\Scripts 
Change-Id: I52094cc4b27b9e3a6fe3dd12c504777b8bb7bc75
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-11-18 22:19:23 +00:00
Konstantin Tokarev
48507e9e3c Provisioning should fail in case of conan errors 
Change-Id: I54ee86f5cf0f39cd7bafe71682b93a2a3c8fce5c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-11-18 22:19:18 +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