Pick-to: 6.10 Change-Id: Ibad51807cf188016e761e76bc62c1fd80aabfbc7 Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>