more QT5 porting cleanup