more Qt 5 fixes
Merge pull request #1 from devinacker/master

more Qt 5 fixes