Pick-to: 6.10 Change-Id: Ie189960af25a33f0dee54fbd49213f9d5eab5891 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>