Change-Id: I230de5dffb47bc6e251507edf66843f24d05fa19 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>