aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-7-x86/02-python.ps1
Commit message (Collapse)AuthorAgeFilesLines
* Split Common folder based on operating system familiesHeikki Halmet2018-01-101-1/+1
| | | | | | | | | | This change will split common folder to four different folders: Linux, Unix, Windows and MacOS. Each of these folders includes scripts which are common for their operating system familes Task-number: QTQAINFRA-1451 Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.9v5.9.0-beta1Liang Qi2017-04-031-1/+1
| | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt This also fixes the 7Z extraction code to work on the windows 7 x86 installation where 7z is not in the PATH anymore with revision 2. The fallback code was 64-bit only and needs the null check for ProgramFiles(x86) along with the fall back to ProgramFiles to locate the 7z executable. Change-Id: Ifcf014c3a99685c427a62898e1fa83910a4a7247
* Rename conan.ps1 and python.ps1 file in configuration dirs tooKonstantin Tokarev2016-11-181-0/+1
Order of files really matters in configuration directories, but I renamed only main implementations in previous commit. Fixed that. Change-Id: Ia541fa8fd36b3d52580ba9814e9f4c38aadce460 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>