Task-number: QTBUG-29893

Change-Id: I7c80a68d9d45c3df3e0bf691b69c4510ccd1649d
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>