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