user avatar
Merge branch '5.9' into 5.12
Oswald Buddenhagen authored
Conflicts:
	.qmake.conf

Change-Id: Ifed1b763570377c86f476d48d3fb37698aeb9a20
2716d003