Task-number: QTCREATORBUG-1934
Reviewed-by: Friedemann Kleint
(cherry picked from commit 557572bb)