[gui] Qt configuration/cache changed by last package updates
[git] adjustment to git merge alias