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