Qt 5: cleaned up some code as a result of Qt 5 having been updated (#138) [ci skip].