Some cleanup
Missing QObject
Merge pull request #1 from jan-moe/master

Some Qt5 fixes and cleanup