Liang Qi c2d188f225 Merge remote-tracking branch 'origin/5.10' into dev ...

Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10

2018-01-12 21:13:56 +01:00

..

android_linux.sh

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

cmake_linux.sh

Merge remote-tracking branch 'origin/5.9' into 5.10

2018-01-11 15:13:13 +01:00

disable_selinux.sh

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

fbx_linux.sh

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

integrity.sh

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

openssl_for_android_linux.sh

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

qnx_700.sh

Merge remote-tracking branch 'origin/5.10' into dev

2018-01-12 21:13:56 +01:00

version.sh

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00