fixes GUI incompatibilty with some qt4 versions
fixes GUI problem when using context menu
Merge branch '2.2'