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