Task-number: QTCREATORBUG-9626
Task-number: QTCREATORBUG-9083

Cherry-picked: 4ff03aa7

Change-Id: I69915d9da91cde39b1bc32f150c30a5e97cba157
Reviewed-by: Eike Ziller <eike.ziller@digia.com>