Pick-to: 6.1 Change-Id: I1fddad28399f83bfb8bfb7bbc0c4825907dfeb4d Reviewed-by: Paul Wicking <paul.wicking@qt.io>