Pick-to: 6.2 Change-Id: Ie35f7a57c6d54c1cc0a7b79d8fd25d0b056bf5e6 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>