OSX build fixes for the Qt version
Merge pull request #4554 from Bigpet/QtMacOSBuildFixes

OSX build fixes for the Qt version