qt/qt5.git - Qt5 super module

	Commit message (Collapse)	Author	Age	Files	Lines
*	Provisioning: Remove logical OR when echo errors	Heikki Halmet	2017-11-07	1	-6/+6
\| \| \| \| \| \| \| \| \| \|	set -e won't work if logical OR is used after commands. These error echo's need to be removed so that error catch will works. Also set -ex added to print executed command when error caught. Task-number: QTQAINFRA-1533 Change-Id: Ib4ea832a0ee813f99f59ebacad51ec57c3eff57d Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
*	Merge remote-tracking branch 'origin/5.6' into 5.9	Liang Qi	2017-09-22	1	-1/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Ensure 'clean' android Installationv5.6.3	Heikki Halmet	2017-09-15	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
* \|	Merge remote-tracking branch 'origin/5.6' into 5.9	Liang Qi	2017-08-22	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Update provisioning scripts with new intra.qt.io address	Tony Sarajärvi	2017-08-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Change-Id: I9b4c5e9d0fe8e0e84596ad9086f563d11e97930b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* \|	Merge remote-tracking branch 'origin/5.8' into 5.9	Simon Hausmann	2017-02-05	1	-10/+7
\|/ \| \| \|	Change-Id: Ic7dab06f6b6e6cf326df651151eade22429b997f
*	Provision: Storage android sdk and ndk version information	Heikki Halmet	2017-02-03	1	-0/+117
	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>