killed a few minor gcc complaints but gave up still... + made things qt4 explicitly
Merge branch 'master' into dev