Task-number: QTBUG-93822 Pick-to: 6.2 Change-Id: If48dcc4e9542070a6d0303406b2b0544d35879d4 Reviewed-by: Simo Fält <simo.falt@qt.io>