Pick-to: 6.7 Change-Id: I83c6b017d81bc98431f0d0421167890466e5b855 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>