Pick-to: 6.8 6.9 Change-Id: I2d90f450fa9a8bb41a2517022546f561fd7feeeb Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>