Task-number: QTBUG-111416 Pick-to: 6.5 Change-Id: Ife91bbc0bf09e3fcc5c4d8dc06e352eadee1b810 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>