changes required for new qtermwidget build/structure; includes fixed for qtermwidget Qt5 port