Qt4 fixes
Merge pull request #8 from matthewvogt/qt4-fix

Qt4 fixes