Pick-to: 6.9 6.8 Change-Id: Ia0809dcba4477da97b506b4a9651b00e4ed5ab2c Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>