Task-number: QTBUG-30318
Change-Id: If3916f3250f202a5da4b1f8034ecfba984367af3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>