Merge pull request #4 from hauke/qt5base-fixes