Pick-to: 6.9 6.8 6.5 Change-Id: I2f880d4ad38f5f3c509c8ddcdad59108d915517b Reviewed-by: Marc Mutz <marc.mutz@qt.io>