It is still unfinished but I want to add other changes first. Change-Id: Ife7ac56576f85d800633ea1e8f1c3f4f16486d5f Task-number: QTCREATORBUG-21377 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>