5 Commits

Author	SHA1	Message	Date
Liang Qi	285ee106e7	Merge remote-tracking branch 'origin/5.6' into 5.9 ... 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	2017-04-03 12:06:27 +00:00
Kari Oikarinen	db9682888c	Add PS provisioning helper for 7-Zip files ... Change-Id: Ice10e54137da8a0d2372019a195a63121fd00a8a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-01-31 18:33:41 +00:00
Heikki Halmet	c9d71e9eeb	Python to provisioning for Windows ... Installs Python version 2.7.10. Python is required for building Qt 5 from source. More specifically qtdeclarative and qtwebkit require it. Change-Id: I63c8f3294a8a4799df5e52fbd41a36db8686950e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2016-09-30 08:31:18 +00:00
Jędrzej Nowacki	2be9656332	Coin provisioning: overwrite files while unzipping ... Change-Id: I5cf59322f5a34cffe9fe8668755800bccb8cc13a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>	2016-05-30 14:08:20 +00:00
Frederik Gladhorn	54f1bfd10c	Add script to install jom through powershell ... Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>	2016-04-28 07:54:48 +00:00