[qt5] move and clean up for merging with qt4