Pick-to: 6.5 6.6 Change-Id: Ic3189044598be8e121c1f065e68e04a3547a87d0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Pick-to: 6.5 6.6 Change-Id: Ie2215ae0feeb322888619aed632e20db9b69e20b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>