This change is based on the feedback from API review.

Change-Id: I43f08d5bd7f7f172ea4d337718be7bd14e81d64c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>