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

Change-Id: I73cc3d9c4a38e6c586ac0c2f54c94184d65c560a
09fa8225