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