Pick-to: 6.5 Change-Id: Iac113bc7ed773f291ef09ebe144e1de1e0e58136 Reviewed-by: Kai Köhne <kai.koehne@qt.io>