Codecleanup for version 1.0.rc4

Moved qplugin code into ui as done in Qt5 migration branch