user avatar
Merge remote-tracking branch 'origin/5.8' into dev
Liang Qi authored
Conflicts:
	.qmake.conf

Change-Id: I602be0ed9a7f23e94a0fb5099488b7c54e39a421
279adce9