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

Change-Id: I2620ebe62524c41b71c607347391e33a217ad88a
6ecc60c5