Change-Id: Ibda0781586f0daf3c7a8dd0a7b2032b7da0fa54b Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>