This amends 79ac430537. Pick-to: 6.6 Change-Id: Id68daff20de11361a1bb20071266e8adafe5e9c4 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
79ac430537