More fixes for Qt 5 on OS X.