More fixes with Qt 5.2.1