6 Commits

Author	SHA1	Message	Date
Liang Qi	04ccf0e8db	Merge remote-tracking branch 'origin/5.6' into 5.9 ... 42b502f is not needed for branches >= 5.8, configure.exe does not exist anymore. 30660bf was not applied to 5.9 branch, the scripts were not adapted to new template. Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: Ie3681d5f641e99a074368f21b7f85fe31beacc17	2017-09-22 21:15:52 +02:00
Heikki Halmet	12fd0d5b9b	Ensure 'clean' android Installation ... Remove old android installation and make sure new 'clean' android folder is created. Change-Id: I4c561797791e08976b07a194c2c9ed2f5aa302bb Reviewed-by: Simo Fält <simo.falt@qt.io>	2017-09-15 10:38:24 +00:00
Liang Qi	74eb853384	Merge remote-tracking branch 'origin/5.6' into 5.9 ... Move the Documentation feature to the corresponding Ubuntu 16.04, where the CI would have used it by magic. Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Done-with: Frederik Gladhorn<frederik.gladhorn@qt.io> Change-Id: I885ce572710480cd15ecdc8cfac7edb52957f92a	2017-08-22 08:22:02 +02:00
Tony Sarajärvi	043e54c7c6	Update provisioning scripts with new intra.qt.io address ... Change-Id: I9b4c5e9d0fe8e0e84596ad9086f563d11e97930b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-08-08 20:05:08 +00:00
Simon Hausmann	527829a600	Merge remote-tracking branch 'origin/5.8' into 5.9 ... Change-Id: Ic7dab06f6b6e6cf326df651151eade22429b997f	2017-02-05 15:17:50 +01:00
Heikki Halmet	a36977963a	Provision: Storage android sdk and ndk version information ... Sdk and ndk version information will be storaged to versions.txt. Versions.txt will be used for all provision scripts and later on it's data will be printed to provision log. Also script name changed to match both android sdk and ndk. Change-Id: I3366e596f539099c3b587466d90905d0889398fe Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-02-03 05:47:05 +00:00