Change-Id: I83878864bd87e54130b5cb098a27de8b455f394f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>