Task-number: QTBUG-111366 Pick-to: 6.5 Change-Id: I5c483cbfec4072dae610c6d98b97d10057ba9ddc Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>