More work on QT5 port