More fixes for Qt 5.0.