Qt: fix issue 1422 + fix formatting
Qt: fix for 46ebd8b
Merge branch '2.2.x'