Task-number: QTBUG-124453 Pick-to: 6.9 6.8 Change-Id: If49bd983e2c4726ba30ba5a5d12f63e1c6511f57 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>