Pick-to: 6.5 Change-Id: I0e7db95bac48b5d79897402f23157d00c4abbdff Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>