make qt4 build easier
Merge remote-tracking branch 'origin/master'