Task-number: QTCREATORBUG-8186

Change-Id: I6ff1ed212d5202dc9ab214c93ea7bca1f07f4e14
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
(cherry picked from commit 19aa02c9)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>