Updated to build on Qt5/MacOSx