user avatar
Merge remote-tracking branch 'origin/5.12' into 5.13
Qt Forward Merge Bot authored
 Conflicts:
	.qmake.conf

Change-Id: Ia0585cba89bf08b3a12413f49fd65d5a63c2c34a
49d744be