Task-number: QTBUG-97243 Pick-to: 6.2 Change-Id: Ibf67b7d713904edb9f8ee83b35eb096e2d3f1eb1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>